You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by bh...@apache.org on 2020/01/10 06:38:11 UTC
[hadoop-ozone] branch master updated: HDDS-2863. BindException in
TestSCMRestart (#425)
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/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 25b4baf HDDS-2863. BindException in TestSCMRestart (#425)
25b4baf is described below
commit 25b4baf123b15cfe8cc1568b16e637932dd8f527
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Jan 10 07:38:00 2020 +0100
HDDS-2863. BindException in TestSCMRestart (#425)
---
.../apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java | 6 +++++-
.../apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java | 7 +++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 77cfd34..d569044 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -164,7 +164,7 @@ public class SCMDatanodeProtocolServer implements
datanodeRpcAddress =
updateRPCListenAddress(
- conf, OZONE_SCM_DATANODE_ADDRESS_KEY, datanodeRpcAddr,
+ conf, getScmDatanodeAddressKey(), datanodeRpcAddr,
datanodeRpcServer);
if (conf.getBoolean(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION,
@@ -407,6 +407,10 @@ public class SCMDatanodeProtocolServer implements
.replaceAll(" +", " ");
}
+ protected String getScmDatanodeAddressKey() {
+ return OZONE_SCM_DATANODE_ADDRESS_KEY;
+ }
+
protected InetSocketAddress getDataNodeBindAddress(OzoneConfiguration conf) {
return HddsServerUtil.getScmDataNodeBindAddress(conf);
}
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
index d109417..19c3aa6 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
@@ -36,6 +36,8 @@ import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_DATANODE_ADDRESS_KEY;
+
/**
* Recon's Datanode protocol server extended from SCM.
*/
@@ -72,6 +74,11 @@ public class ReconDatanodeProtocolServer extends SCMDatanodeProtocolServer {
}
@Override
+ protected String getScmDatanodeAddressKey() {
+ return OZONE_RECON_DATANODE_ADDRESS_KEY;
+ }
+
+ @Override
public InetSocketAddress getDataNodeBindAddress(OzoneConfiguration conf) {
return HddsServerUtil.getReconDataNodeBindAddress(conf);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org