big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-999. Make the DNS resolution in OzoneManager more resilient

Browse Source 
Closes #758
This commit is contained in:
Siddharth Wagle 2019-04-26 12:38:24 +02:00 committed by Márton Elek
parent 79d3d35398
commit c35abcd831
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28
12 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml vendored
View File

@ -44,7 +44,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["ozone","om"] command: ["ozone","om"]

3
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml vendored
View File

@ -36,7 +36,6 @@ services:
- 9890:9872 - 9890:9872
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]
@ -50,7 +49,6 @@ services:
- 9892:9872 - 9892:9872
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]
@ -64,7 +62,6 @@ services:
- 9894:9872 - 9894:9872
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml vendored
View File

@ -36,7 +36,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml vendored
View File

@ -36,7 +36,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml vendored
View File

@ -34,7 +34,6 @@ services:
- 9874 - 9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["/opt/hadoop/bin/ozone","om"] command: ["/opt/hadoop/bin/ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml vendored
View File

@ -33,7 +33,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["ozone","om"] command: ["ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml vendored
View File

@ -33,7 +33,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["ozone","om"] command: ["ozone","om"]

1
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml vendored
View File

@ -49,7 +49,6 @@ services:
ports: ports:
- 9874:9874 - 9874:9874
environment: environment:
WAITFOR: scm:9876
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
env_file: env_file:
- docker-config - docker-config

1
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml vendored
View File

@ -51,7 +51,6 @@ services:
ports: ports:
- 9874:9874 - 9874:9874
environment: environment:
WAITFOR: scm:9876
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
env_file: env_file:
- docker-config - docker-config

1
hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml vendored
View File

@ -39,7 +39,6 @@ services:
- 9874:9874 - 9874:9874
environment: environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
WAITFOR: scm:9876
env_file: env_file:
- ./docker-config - ./docker-config
command: ["ozone","om"] command: ["ozone","om"]

6
hadoop-ozone/dist/src/main/k8s/ozone/om-statefulset.yaml vendored
View File

@ -43,9 +43,6 @@ spec:
- ozone - ozone
- om - om
- --init - --init
env:
- name: "WAITFOR"
value: "scm-0.scm:9876"
volumeMounts: volumeMounts:
- name: "data" - name: "data"
mountPath: "/data" mountPath: "/data"
@ -58,9 +55,6 @@ spec:
args: args:
- ozone - ozone
- om - om
env:
- name: "WAITFOR"
value: "scm-0.scm:9876"
volumeMounts: volumeMounts:
- name: "data" - name: "data"
mountPath: "/data" mountPath: "/data"

2
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View File

@ -302,7 +302,7 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
// For testing purpose only, not hit scm from om as Hadoop UGI can't login // For testing purpose only, not hit scm from om as Hadoop UGI can't login
// two principals in the same JVM. // two principals in the same JVM.
if (!testSecureOmFlag) { if (!testSecureOmFlag) {
ScmInfo scmInfo = scmBlockClient.getScmInfo(); ScmInfo scmInfo = getScmInfo(configuration);
if (!(scmInfo.getClusterId().equals(omStorage.getClusterID()) && scmInfo if (!(scmInfo.getClusterId().equals(omStorage.getClusterID()) && scmInfo
.getScmId().equals(omStorage.getScmId()))) { .getScmId().equals(omStorage.getScmId()))) {
throw new OMException("SCM version info mismatch.", throw new OMException("SCM version info mismatch.",