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 2019/04/26 10:46:29 UTC
[hadoop] branch trunk updated: HDDS-999. Make the DNS resolution in
OzoneManager more resilient
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c35abcd HDDS-999. Make the DNS resolution in OzoneManager more resilient
c35abcd is described below
commit c35abcd831c5b1c96e8ffa9b3cc64ef2f51fb7e1
Author: Siddharth Wagle <sw...@hortonworks.com>
AuthorDate: Fri Apr 26 12:38:24 2019 +0200
HDDS-999. Make the DNS resolution in OzoneManager more resilient
Closes #758
---
hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml | 3 ---
hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml | 1 -
.../dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml | 1 -
hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml | 6 ------
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 2 +-
12 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
index e44a7bd..ad096c3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml
@@ -44,7 +44,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["ozone","om"]
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 d0e4b65..9628990 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
@@ -36,7 +36,6 @@ services:
- 9890:9872
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
@@ -50,7 +49,6 @@ services:
- 9892:9872
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
@@ -64,7 +62,6 @@ services:
- 9894:9872
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
index dd0abef..7aad15b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
@@ -36,7 +36,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
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 ebbcd5c..8ceda47 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -36,7 +36,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
index ce5de8c..86d7aed 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml
@@ -34,7 +34,6 @@ services:
- 9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["/opt/hadoop/bin/ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
index 4f5230b..768ec4b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
@@ -33,7 +33,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
index 343b5d7..c18aba3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
@@ -33,7 +33,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["ozone","om"]
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 299b881..5f8d1bf 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
@@ -49,7 +49,6 @@ services:
ports:
- 9874:9874
environment:
- WAITFOR: scm:9876
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
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 e866c01..65cf15b 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -51,7 +51,6 @@ services:
ports:
- 9874:9874
environment:
- WAITFOR: scm:9876
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
env_file:
- docker-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
index 3eb656e..c676e57 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml
@@ -39,7 +39,6 @@ services:
- 9874:9874
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- WAITFOR: scm:9876
env_file:
- ./docker-config
command: ["ozone","om"]
diff --git a/hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml b/hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml
index 08d6089..e9eeea8 100644
--- a/hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml
@@ -43,9 +43,6 @@ spec:
- ozone
- om
- --init
- env:
- - name: "WAITFOR"
- value: "scm-0.scm:9876"
volumeMounts:
- name: "data"
mountPath: "/data"
@@ -58,9 +55,6 @@ spec:
args:
- ozone
- om
- env:
- - name: "WAITFOR"
- value: "scm-0.scm:9876"
volumeMounts:
- name: "data"
mountPath: "/data"
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 0d7dc80..c147346 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -302,7 +302,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
// For testing purpose only, not hit scm from om as Hadoop UGI can't login
// two principals in the same JVM.
if (!testSecureOmFlag) {
- ScmInfo scmInfo = scmBlockClient.getScmInfo();
+ ScmInfo scmInfo = getScmInfo(configuration);
if (!(scmInfo.getClusterId().equals(omStorage.getClusterID()) && scmInfo
.getScmId().equals(omStorage.getScmId()))) {
throw new OMException("SCM version info mismatch.",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org