This is an automated email from the ASF dual-hosted git repository.
bharat 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 91993c1 HDDS-5234.Change default grpc and ratis ports for scm ha
(#2251)
91993c1 is described below
commit 91993c177f8a0a1762c7cfcdbe822125c1130350
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Mon May 17 21:28:31 2021 +0530
HDDS-5234.Change default grpc and ratis ports for scm ha (#2251)
---
.../java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 4 ++--
.../apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java | 4 ++--
hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ++--
.../org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java | 2 +-
.../dist/src/main/compose/ozone-ha/docker-compose.yaml | 10 +++++-----
.../src/main/compose/ozonesecure-ha/docker-compose.yaml | 16 ++++++++--------
.../dist/src/main/smoketest/admincli/scmha.robot | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
index e8c1b97..d6ba48d 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
@@ -431,11 +431,11 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_RATIS_PORT_KEY
= "ozone.scm.ratis.port";
public static final int OZONE_SCM_RATIS_PORT_DEFAULT
- = 9865;
+ = 9894;
public static final String OZONE_SCM_GRPC_PORT_KEY
= "ozone.scm.grpc.port";
public static final int OZONE_SCM_GRPC_PORT_DEFAULT
- = 9866;
+ = 9895;
public static final String OZONE_SCM_RATIS_RPC_TYPE_KEY
= "ozone.scm.ratis.rpc.type";
public static final String OZONE_SCM_RATIS_RPC_TYPE_DEFAULT
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
index 5fe251b..d1d2e88 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
@@ -54,11 +54,11 @@ public class SCMHAConfiguration {
@Config(key = "ratis.bind.port",
type = ConfigType.INT,
- defaultValue = "9865",
+ defaultValue = "9894",
tags = {OZONE, SCM, HA, RATIS},
description = "Port used by SCM for Ratis Server."
)
- private int ratisBindPort = 9865;
+ private int ratisBindPort = 9894;
@Config(key = "ratis.rpc.type",
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index d25720d..d64a212 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -2029,7 +2029,7 @@
<property>
<name>ozone.scm.ratis.port</name>
- <value>9865</value>
+ <value>9894</value>
<tag>OZONE, SCM, HA, RATIS</tag>
<description>
The port number of the SCM's Ratis server.
@@ -2038,7 +2038,7 @@
<property>
<name>ozone.scm.grpc.port</name>
- <value>9866</value>
+ <value>9895</value>
<tag>OZONE, SCM, HA, RATIS</tag>
<description>
The port number of the SCM's grpc server.
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java
index e0e5360..98afcc1 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockSCMHAManager.java
@@ -224,7 +224,7 @@ public final class MockSCMHAManager implements SCMHAManager
{
@Override
public List<String> getRatisRoles() {
return Arrays
- .asList("180.3.14.5:9865", "180.3.14.21:9865", "180.3.14.145:9865");
+ .asList("180.3.14.5:9894", "180.3.14.21:9894", "180.3.14.145:9894");
}
@Override
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 4489a55..615dc9e 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
@@ -41,7 +41,7 @@ services:
om1:
<<: *common-config
environment:
- WAITFOR: scm3:9865
+ WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
ports:
@@ -52,7 +52,7 @@ services:
om2:
<<: *common-config
environment:
- WAITFOR: scm3:9865
+ WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
ports:
@@ -63,7 +63,7 @@ services:
om3:
<<: *common-config
environment:
- WAITFOR: scm3:9865
+ WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
ports:
@@ -85,7 +85,7 @@ services:
ports:
- 9876
environment:
- WAITFOR: scm1:9865
+ WAITFOR: scm1:9894
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
@@ -95,7 +95,7 @@ services:
ports:
- 9876
environment:
- WAITFOR: scm2:9865
+ WAITFOR: scm2:9894
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
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 d76666d..b96034b 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
@@ -56,7 +56,7 @@ services:
env_file:
- docker-config
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
KERBEROS_KEYTABS: dn HTTP
OZONE_OPTS:
networks:
@@ -77,7 +77,7 @@ services:
env_file:
- docker-config
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
KERBEROS_KEYTABS: dn HTTP
OZONE_OPTS:
networks:
@@ -98,7 +98,7 @@ services:
env_file:
- docker-config
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
KERBEROS_KEYTABS: dn HTTP
OZONE_OPTS:
networks:
@@ -114,7 +114,7 @@ services:
- 9890:9872
#- 18001:18001
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
KERBEROS_KEYTABS: om HTTP
OZONE_OPTS:
@@ -138,7 +138,7 @@ services:
- 9892:9872
#- 18002:18002
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
KERBEROS_KEYTABS: om HTTP
OZONE_OPTS:
@@ -162,7 +162,7 @@ services:
- 9894:9872
#- 18003:18003
environment:
- WAITFOR: scm3.org:9865
+ WAITFOR: scm3.org:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
KERBEROS_KEYTABS: om HTTP
OZONE_OPTS:
@@ -229,7 +229,7 @@ services:
env_file:
- docker-config
environment:
- WAITFOR: scm1.org:9865
+ WAITFOR: scm1.org:9894
KERBEROS_KEYTABS: scm HTTP testuser testuser2
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-3}"
@@ -256,7 +256,7 @@ services:
env_file:
- docker-config
environment:
- WAITFOR: scm2.org:9865
+ WAITFOR: scm2.org:9894
KERBEROS_KEYTABS: scm HTTP testuser testuser2
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-3}"
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/scmha.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/scmha.robot
index 21e4ce4..c02333b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/scmha.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/scmha.robot
@@ -25,4 +25,4 @@ Test Timeout 5 minutes
*** Test Cases ***
Run scm roles
${output} = Execute ozone admin scm roles
- Should Match Regexp ${output} [scm:9865(:LEADER|)]
+ Should Match Regexp ${output} [scm:9894(:LEADER|)]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
