HDDS-999. Make the DNS resolution in OzoneManager more resilient
Closes #758
This commit is contained in:
parent
79d3d35398
commit
c35abcd831
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -49,7 +49,6 @@ services:
|
|||
ports:
|
||||
- 9874:9874
|
||||
environment:
|
||||
WAITFOR: scm:9876
|
||||
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
|
||||
env_file:
|
||||
- docker-config
|
||||
|
|
|
@ -51,7 +51,6 @@ services:
|
|||
ports:
|
||||
- 9874:9874
|
||||
environment:
|
||||
WAITFOR: scm:9876
|
||||
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
|
||||
env_file:
|
||||
- docker-config
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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.",
|
||||
|
|
Loading…
Reference in New Issue