You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2018/09/10 18:52:21 UTC

hadoop git commit: HDDS-421. Resilient DNS resolution in datanode-service. Contributed by Elek, Marton.

Repository: hadoop
Updated Branches:
  refs/heads/ozone-0.2 237d1c3ee -> dfd7ece2d


HDDS-421. Resilient DNS resolution in datanode-service. Contributed by Elek, Marton.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dfd7ece2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dfd7ece2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dfd7ece2

Branch: refs/heads/ozone-0.2
Commit: dfd7ece2dffdc49642d460586e1ad0bc8dea354a
Parents: 237d1c3
Author: Márton Elek <el...@apache.org>
Authored: Sun Sep 9 23:26:55 2018 +0200
Committer: Márton Elek <el...@apache.org>
Committed: Mon Sep 10 20:52:00 2018 +0200

----------------------------------------------------------------------
 .../common/states/datanode/InitDatanodeState.java         | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dfd7ece2/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
----------------------------------------------------------------------
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
index f04d392..b348327 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java
@@ -93,6 +93,16 @@ public class InitDatanodeState implements DatanodeState,
       return DatanodeStateMachine.DatanodeStates.SHUTDOWN;
     } else {
       for (InetSocketAddress addr : addresses) {
+        if (addr.isUnresolved()) {
+          LOG.warn("One SCM address ({}) can't (yet?) be resolved. Postpone "
+              + "initialization.", addr);
+
+          //skip any further initialization. DatanodeStateMachine will try it
+          // again after the hb frequency
+          return this.context.getState();
+        }
+      }
+      for (InetSocketAddress addr : addresses) {
         connectionManager.addSCMServer(addr);
       }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org