This is an automated email from the ASF dual-hosted git repository. michaelsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit c75e8b28e6246a4a1e131b66b4d3dc74774d62fd Author: Michael Smith <[email protected]> AuthorDate: Fri Jun 16 15:30:27 2023 -0700 IMPALA-12227: Configure Ozone datanode client port Ozone with HDDS-8501 adds a new port to datanodes configured via hdds.datanode.client.port. Add it to our minicluster configuration to avoid BindException on startup. Change-Id: Ifdd591c3e7d9755ddadf151650e5b477d9f492c8 Reviewed-on: http://gerrit.cloudera.org:8080/20086 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- testdata/cluster/admin | 4 ++++ .../cluster/node_templates/common/etc/hadoop/conf/ozone-site.xml.py | 1 + 2 files changed, 5 insertions(+) diff --git a/testdata/cluster/admin b/testdata/cluster/admin index 10f9e56ea..af44ed565 100755 --- a/testdata/cluster/admin +++ b/testdata/cluster/admin @@ -75,6 +75,7 @@ DATANODE_FREE_PORT_START=31000 DATANODE_FREE_HTTP_PORT_START=31010 DATANODE_FREE_IPC_PORT_START=31020 DATANODE_FREE_HTTPS_PORT_START=31030 +DATANODE_FREE_CLIENT_PORT_START=31040 NODEMANAGER_FREE_PORT_START=31100 NODEMANAGER_FREE_LOCALIZER_PORT_START=31120 NODEMANAGER_FREE_WEBUI_PORT_START=31140 @@ -241,6 +242,7 @@ function create_cluster { DATANODE_HTTP_PORT=$((DATANODE_FREE_HTTP_PORT_START++)) DATANODE_IPC_PORT=$((DATANODE_FREE_IPC_PORT_START++)) DATANODE_HTTPS_PORT=$((DATANODE_FREE_HTTPS_PORT_START++)) + DATANODE_CLIENT_PORT=$((DATANODE_FREE_CLIENT_PORT_START++)) NODEMANAGER_PORT=$((NODEMANAGER_FREE_PORT_START++)) NODEMANAGER_LOCALIZER_PORT=$((NODEMANAGER_FREE_LOCALIZER_PORT_START++)) NODEMANAGER_WEBUI_PORT=$((NODEMANAGER_FREE_WEBUI_PORT_START++)) @@ -250,6 +252,7 @@ function create_cluster { "DATANODE_HTTP_PORT=$DATANODE_HTTP_PORT," \ "DATANODE_IPC_PORT=$DATANODE_IPC_PORT," \ "DATANODE_HTTPS_PORT=$DATANODE_HTTPS_PORT," \ + "DATANODE_CLIENT_PORT=$DATANODE_CLIENT_PORT," \ "NODEMANAGER_PORT=$NODEMANAGER_PORT," \ "NODEMANAGER_LOCALIZER_PORT=$NODEMANAGER_LOCALIZER_PORT," \ "NODEMANAGER_WEBUI_PORT=$NODEMANAGER_WEBUI_PORT," \ @@ -258,6 +261,7 @@ function create_cluster { export NODE NODE_DIR export DATANODE_PORT DATANODE_HTTP_PORT DATANODE_IPC_PORT DATANODE_HTTPS_PORT + export DATANODE_CLIENT_PORT export NODEMANAGER_PORT NODEMANAGER_LOCALIZER_PORT NODEMANAGER_WEBUI_PORT export KUDU_TS_RPC_PORT KUDU_TS_WEBUI_PORT for TEMPLATE_PATH in $(find "$NODE_DIR" -name "*$TEMPLATE_SUFFIX"); do diff --git a/testdata/cluster/node_templates/common/etc/hadoop/conf/ozone-site.xml.py b/testdata/cluster/node_templates/common/etc/hadoop/conf/ozone-site.xml.py index 45598187e..de647278e 100644 --- a/testdata/cluster/node_templates/common/etc/hadoop/conf/ozone-site.xml.py +++ b/testdata/cluster/node_templates/common/etc/hadoop/conf/ozone-site.xml.py @@ -34,6 +34,7 @@ CONFIG = { # Select a random available port 'hdds.datanode.http-address': '${EXTERNAL_LISTEN_HOST}:0', 'hdds.datanode.replication.port': '0', + 'hdds.datanode.client.port': '${DATANODE_CLIENT_PORT}', # Directories 'ozone.metadata.dirs': '${NODE_DIR}/data/ozone',
