This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 7963745216 HDDS-9512. Datanode client port conflicts with HDFS
Datanode web port (#5639)
7963745216 is described below
commit 79637452164a069875a3a312a4fe45d19e84ea4b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Nov 23 10:36:42 2023 +0100
HDDS-9512. Datanode client port conflicts with HDFS Datanode web port
(#5639)
---
.../java/org/apache/hadoop/hdds/HddsConfigKeys.java | 2 +-
.../common/src/main/resources/ozone-default.xml | 2 +-
hadoop-hdds/docs/content/feature/Reconfigurability.md | 18 +++++++++---------
.../docs/content/feature/Reconfigurability.zh.md | 18 +++++++++---------
.../intellij/runConfigurations/Datanode2-ha.xml | 2 +-
.../intellij/runConfigurations/Datanode2.xml | 2 +-
.../intellij/runConfigurations/Datanode3-ha.xml | 2 +-
.../intellij/runConfigurations/Datanode3.xml | 2 +-
.../src/main/compose/compatibility/docker-compose.yaml | 2 +-
.../src/main/compose/ozone-csi/docker-compose.yaml | 2 +-
.../dist/src/main/compose/ozone-ha/docker-compose.yaml | 2 +-
.../src/main/compose/ozone-om-ha/docker-compose.yaml | 2 +-
.../main/compose/ozone-om-prepare/docker-compose.yaml | 2 +-
.../main/compose/ozone-topology/docker-compose.yaml | 12 ++++++------
.../dist/src/main/compose/ozone/docker-compose.yaml | 2 +-
.../src/main/compose/ozoneblockade/docker-compose.yaml | 2 +-
.../src/main/compose/ozonescripts/docker-compose.yaml | 2 +-
.../main/compose/ozonesecure-ha/docker-compose.yaml | 2 +-
.../main/compose/ozonesecure-mr/docker-compose.yaml | 2 +-
.../src/main/compose/ozonesecure/docker-compose.yaml | 2 +-
.../ozonesecure/public-key-cert-recovery-test.sh | 4 ++--
.../dist/src/main/compose/restart/docker-compose.yaml | 2 +-
.../compose/upgrade/compose/ha/docker-compose.yaml | 2 +-
.../compose/upgrade/compose/non-ha/docker-compose.yaml | 2 +-
.../compose/upgrade/compose/om-ha/docker-compose.yaml | 2 +-
.../dist/src/main/compose/xcompat/new-cluster.yaml | 2 +-
.../dist/src/main/compose/xcompat/old-cluster.yaml | 2 +-
.../network-tests/src/test/compose/docker-compose.yaml | 2 +-
28 files changed, 50 insertions(+), 50 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index 1200bd8bfa..7b007fdca1 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -362,7 +362,7 @@ public final class HddsConfigKeys {
"0.0.0.0";
public static final String HDDS_DATANODE_CLIENT_PORT_KEY =
"hdds.datanode.client.port";
- public static final int HDDS_DATANODE_CLIENT_PORT_DEFAULT = 9864;
+ public static final int HDDS_DATANODE_CLIENT_PORT_DEFAULT = 19864;
public static final String HDDS_DATANODE_HANDLER_COUNT_KEY =
"hdds.datanode.handler.count";
public static final int HDDS_DATANODE_HANDLER_COUNT_DEFAULT = 1;
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index b8774f47b1..c84aa91150 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -2811,7 +2811,7 @@
</property>
<property>
<name>hdds.datanode.client.port</name>
- <value>9864</value>
+ <value>19864</value>
<tag>OZONE, HDDS, MANAGEMENT</tag>
<description>
The port number of the Ozone Datanode client service.
diff --git a/hadoop-hdds/docs/content/feature/Reconfigurability.md
b/hadoop-hdds/docs/content/feature/Reconfigurability.md
index a237e478b1..af220554ba 100644
--- a/hadoop-hdds/docs/content/feature/Reconfigurability.md
+++ b/hadoop-hdds/docs/content/feature/Reconfigurability.md
@@ -84,17 +84,17 @@ ozone.administrators
## Datanode Reconfigurability
>For example, modify `ozone.example.config` in ozone-site.xml and execute:
>
-> $ `ozone admin reconfig --address=hadoop1:9864 start`<br>
-Datanode: Started reconfiguration task on node [hadoop1:9864].
+> $ `ozone admin reconfig --address=hadoop1:19864 start`<br>
+Datanode: Started reconfiguration task on node [hadoop1:19864].
>
->$ `ozone admin reconfig --address=hadoop1:9864 status`<br>
-Datanode: Reconfiguring status for node [hadoop1:9864]: started at Wed Dec 28
19:04:44 CST 2022 and finished at Wed Dec 28 19:04:44 CST 2022.<br>
+>$ `ozone admin reconfig --address=hadoop1:19864 status`<br>
+Datanode: Reconfiguring status for node [hadoop1:19864]: started at Wed Dec 28
19:04:44 CST 2022 and finished at Wed Dec 28 19:04:44 CST 2022.<br>
SUCCESS: Changed property ozone.example.config<br>
From: "old"<br>
To: "new"
>
-> $ `ozone admin reconfig -address=hadoop1:9864 properties`<br>
-Datanode: Node [hadoop1:9864] Reconfigurable properties:<br>
+> $ `ozone admin reconfig -address=hadoop1:19864 properties`<br>
+Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config
### Batch operation
@@ -105,10 +105,10 @@ Currently, only Datanode supports batch operations<br>
>For example, to list the reconfigurable properties of all Datanodes:<br>
> $ `ozone admin reconfig --in-service-datanodes properties`<br>
-Datanode: Node [hadoop1:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config<br>
-Datanode: Node [hadoop2:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop2:19864] Reconfigurable properties:<br>
ozone.example.config<br>
-Datanode: Node [hadoop3:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop3:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Reconfig successfully 3 nodes, failure 0 nodes.<br>
diff --git a/hadoop-hdds/docs/content/feature/Reconfigurability.zh.md
b/hadoop-hdds/docs/content/feature/Reconfigurability.zh.md
index 321b6f137e..8e983a98ab 100644
--- a/hadoop-hdds/docs/content/feature/Reconfigurability.zh.md
+++ b/hadoop-hdds/docs/content/feature/Reconfigurability.zh.md
@@ -83,17 +83,17 @@ ozone.administrators
## Datanode 动态配置
>例如, 在`ozone-site.xml`文件中修改`ozone.example.config`的值并执行:
>
-> $ `ozone admin reconfig --address=hadoop1:9864 start`<br>
-Datanode: Started reconfiguration task on node [hadoop1:9864].
+> $ `ozone admin reconfig --address=hadoop1:19864 start`<br>
+Datanode: Started reconfiguration task on node [hadoop1:19864].
>
->$ `ozone admin reconfig --address=hadoop1:9864 status`<br>
-Datanode: Reconfiguring status for node [hadoop1:9864]: started at Wed Dec 28
19:04:44 CST 2022 and finished at Wed Dec 28 19:04:44 CST 2022.<br>
+>$ `ozone admin reconfig --address=hadoop1:19864 status`<br>
+Datanode: Reconfiguring status for node [hadoop1:19864]: started at Wed Dec 28
19:04:44 CST 2022 and finished at Wed Dec 28 19:04:44 CST 2022.<br>
SUCCESS: Changed property ozone.example.config<br>
From: "old"<br>
To: "new"
>
-> $ `ozone admin reconfig --address=hadoop1:9864 properties`<br>
-Datanode: Node [hadoop1:9864] Reconfigurable properties:<br>
+> $ `ozone admin reconfig --address=hadoop1:19864 properties`<br>
+Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config
@@ -105,10 +105,10 @@ ozone.example.config
>例如, 列出 Datanode 所有可配置的属性:<br>
> $ `ozone admin reconfig --in-service-datanodes properties`<br>
-Datanode: Node [hadoop1:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config<br>
-Datanode: Node [hadoop2:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop2:19864] Reconfigurable properties:<br>
ozone.example.config<br>
-Datanode: Node [hadoop3:9864] Reconfigurable properties:<br>
+Datanode: Node [hadoop3:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Reconfig successfully 3 nodes, failure 0 nodes.<br>
\ No newline at end of file
diff --git
a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
index 686db8e09e..171494aa5d 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
@@ -18,7 +18,7 @@
<configuration default="false" name="Datanode2-ha" type="Application"
factoryName="Application">
<option name="MAIN_CLASS_NAME"
value="org.apache.hadoop.ozone.HddsDatanodeService" />
<module name="ozone-datanode" />
- <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set
ozone.metadata.dirs=/tmp/datanode2 --set
hdds.datanode.dir=/tmp/datanode2/storage --set
hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022
--set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set
dfs.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026
--set hdds.datanode.client.port=19864" />
+ <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set
ozone.metadata.dirs=/tmp/datanode2 --set
hdds.datanode.dir=/tmp/datanode2/storage --set
hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022
--set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set
dfs.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026
--set dfs.container.ratis.datastream.port=10027 --set hd [...]
<option name="VM_PARAMETERS"
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
/>
<extension name="coverage">
<pattern>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
index 6b5b2e6244..437757d649 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2.xml
@@ -18,7 +18,7 @@
<configuration default="false" name="Datanode2" type="Application"
factoryName="Application">
<option name="MAIN_CLASS_NAME"
value="org.apache.hadoop.ozone.HddsDatanodeService" />
<module name="ozone-datanode" />
- <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set
ozone.metadata.dirs=/tmp/datanode2 --set
hdds.datanode.dir=/tmp/datanode2/storage --set
hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022
--set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set
dfs.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026
--set dfs.container.ratis.datastream.port=10027 --set hdds. [...]
+ <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set
ozone.metadata.dirs=/tmp/datanode2 --set
hdds.datanode.dir=/tmp/datanode2/storage --set
hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022
--set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set
dfs.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026
--set dfs.container.ratis.datastream.port=10027 --set hdds. [...]
<option name="VM_PARAMETERS"
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
/>
<extension name="coverage">
<pattern>
diff --git
a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
index 68556ee2aa..4a820682a0 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
@@ -18,7 +18,7 @@
<configuration default="false" name="Datanode3-ha" type="Application"
factoryName="Application">
<option name="MAIN_CLASS_NAME"
value="org.apache.hadoop.ozone.HddsDatanodeService" />
<module name="ozone-datanode" />
- <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set
ozone.metadata.dirs=/tmp/datanode3 --set
hdds.datanode.dir=/tmp/datanode3/storage --set
hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032
--set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set
dfs.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036
--set hdds.datanode.client.port=29864" />
+ <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set
ozone.metadata.dirs=/tmp/datanode3 --set
hdds.datanode.dir=/tmp/datanode3/storage --set
hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032
--set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set
dfs.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036
--set dfs.container.ratis.datastream.port=10037 --set hd [...]
<option name="VM_PARAMETERS"
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
/>
<extension name="coverage">
<pattern>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
index c7d3d6ca67..590251b0c5 100644
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3.xml
@@ -18,7 +18,7 @@
<configuration default="false" name="Datanode3" type="Application"
factoryName="Application">
<option name="MAIN_CLASS_NAME"
value="org.apache.hadoop.ozone.HddsDatanodeService" />
<module name="ozone-datanode" />
- <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set
ozone.metadata.dirs=/tmp/datanode3 --set
hdds.datanode.dir=/tmp/datanode3/storage --set
hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032
--set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set
dfs.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036
--set dfs.container.ratis.datastream.port=10037 --set hdds. [...]
+ <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set
ozone.metadata.dirs=/tmp/datanode3 --set
hdds.datanode.dir=/tmp/datanode3/storage --set
hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032
--set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set
dfs.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036
--set dfs.container.ratis.datastream.port=10037 --set hdds. [...]
<option name="VM_PARAMETERS"
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
/>
<extension name="coverage">
<pattern>
diff --git
a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
index e742697400..2f97d242ed 100644
--- a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
datanode:
<<: *common-config
ports:
- - 9864
+ - 19864
- 9882
environment:
<<: *replication
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
index 100585d57c..2d79546265 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
environment:
OZONE_OPTS:
ports:
- - 9864
+ - 19864
- 9882
command: ["ozone","datanode"]
om:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
index cf89407868..947df508b2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
datanode:
<<: *common-config
ports:
- - 9864
+ - 19864
- 9882
environment:
<<: *replication
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
index 38e8eb7e8d..8792046097 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
command: sh -c "sudo /usr/sbin/sshd -E /tmp/sshd.log &&
/opt/hadoop/bin/ozone datanode"
env_file:
- ./docker-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
index fea928fea5..8e0cd16373 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
@@ -34,7 +34,7 @@ x-datanode:
environment:
<<: *replication
ports:
- - 9864
+ - 19864
- 9882
x-om:
diff --git
a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
index cb86044446..fdee3fa16e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
@@ -38,7 +38,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
@@ -54,7 +54,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
@@ -70,7 +70,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
@@ -86,7 +86,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
@@ -102,7 +102,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
- 9882
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index 64d9c68bcb..0d93ed0650 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
datanode:
<<: *common-config
ports:
- - 9864
+ - 19864
- 9882
environment:
<<: *replication
diff --git
a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
index b7852b9f0f..0db6fa13eb 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
- ./docker-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
index a30405df0d..0b149482d9 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
volumes:
- ../..:/opt/hadoop
ports:
- - 9864
+ - 19864
env_file:
- ./docker-config
om:
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
index 05974aa83b..af2b9c4ea6 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml
@@ -49,7 +49,7 @@ services:
- ../_keytabs:/etc/security/keytabs
- ./krb5.conf:/etc/krb5.conf
ports:
- - 9864:9999
+ - 19864:9999
command: ["/opt/hadoop/bin/ozone","datanode"]
extra_hosts:
- "scm1.org: 172.25.0.116"
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
index e2ab7b6b02..189d087be6 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml
@@ -40,7 +40,7 @@ services:
- ../_keytabs:/etc/security/keytabs
- ./krb5.conf:/etc/krb5.conf
ports:
- - 9864
+ - 19864
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
- docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
index d577b27c38..bba79dea85 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -43,7 +43,7 @@ services:
- ../_keytabs:/etc/security/keytabs
- ./krb5.conf:/etc/krb5.conf
ports:
- - 9864
+ - 19864
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
- docker-config
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure/public-key-cert-recovery-test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure/public-key-cert-recovery-test.sh
index 01293c6685..d7ed0d9bd4 100755
---
a/hadoop-ozone/dist/src/main/compose/ozonesecure/public-key-cert-recovery-test.sh
+++
b/hadoop-ozone/dist/src/main/compose/ozonesecure/public-key-cert-recovery-test.sh
@@ -26,10 +26,10 @@ wait_for_port recon 9888 120
wait_for_execute_command recon 60 "find /data/metadata/recon/keys/public.pem
&& find /data/metadata/recon/certs/ROOTCA*.crt"
#test DN
-wait_for_port datanode 9864 120
+wait_for_port datanode 19864 120
wait_for_execute_command datanode 60 "find /data/metadata/dn/keys/public.pem
-delete && find /data/metadata/dn/certs/*.crt -delete"
docker-compose stop datanode
docker-compose start datanode
-wait_for_port datanode 9864 120
+wait_for_port datanode 19864 120
wait_for_execute_command datanode 60 "find /data/metadata/dn/keys/public.pem
&& find /data/metadata/dn/certs/ROOTCA*.crt"
diff --git a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
index 7a98bb602c..d0923c5f7d 100644
--- a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
@@ -34,7 +34,7 @@ x-datanode:
environment:
<<: *replication
ports:
- - 9864
+ - 19864
- 9882
services:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
index 6d83ffc0b2..f7fea2f562 100644
--- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
@@ -37,7 +37,7 @@ x-datanode:
environment:
<<: *environment
ports:
- - 9864
+ - 19864
- 9882
x-scm:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
index 34e3c5e5ee..68d1874cb1 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
@@ -36,7 +36,7 @@ x-datanode:
environment:
<<: *environment
ports:
- - 9864
+ - 19864
- 9882
x-volumes:
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
index d95006b13d..33ca9da347 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
@@ -36,7 +36,7 @@ x-datanode:
environment:
<<: *environment
ports:
- - 9864
+ - 19864
- 9882
x-om:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
index 6014ec0d51..7dfd061c8a 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
@@ -29,7 +29,7 @@ services:
datanode:
<<: *new-config
ports:
- - 9864
+ - 19864
- 9882
environment:
OZONE_OPTS:
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
index 22441e99c8..dbdaa20a2a 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
@@ -29,7 +29,7 @@ services:
datanode:
<<: *old-config
ports:
- - 9864
+ - 19864
- 9882
environment:
HADOOP_OPTS:
diff --git
a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
index 83812233d8..c2903cc91f 100644
---
a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
+++
b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
datanode:
image: ${docker.image}
ports:
- - 9864
+ - 19864
command: ["/opt/hadoop/bin/ozone","datanode"]
env_file:
- ./docker-config
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
