From 68a43f7cd13872af892351078a52178a1fdf6c6d Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com> Date: Tue, 6 May 2025 22:05:52 +0800 Subject: [PATCH] HDDS-12974. Docker could not parse extra host IP (#8397) (cherry picked from commit 1d1bc883b7ce53a4410c1e4e1bb7fff6ddf89798) --- .../ozonesecure-ha/docker-compose.yaml | 90 +++++++++---------- .../ozonesecure-ha/s3g-virtual-host.yaml | 2 +- .../ozonesecure-ha/scm-decommission.yaml | 22 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml index e48d3cb9b050..69568e6c25ce 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-compose.yaml @@ -54,10 +54,10 @@ services: - 19864:9999 command: ["/opt/hadoop/bin/ozone","datanode"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" - - "recon: 172.25.0.115" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" + - "recon=172.25.0.115" env_file: - docker-config environment: @@ -77,10 +77,10 @@ services: - 9866:9999 command: ["/opt/hadoop/bin/ozone","datanode"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" - - "recon: 172.25.0.115" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" + - "recon=172.25.0.115" env_file: - docker-config environment: @@ -100,10 +100,10 @@ services: - 9868:9999 command: ["/opt/hadoop/bin/ozone","datanode"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" - - "recon: 172.25.0.115" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" + - "recon=172.25.0.115" env_file: - docker-config environment: @@ -132,9 +132,9 @@ services: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.111 @@ -158,9 +158,9 @@ services: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.112 @@ -184,9 +184,9 @@ services: - ./docker-config command: ["/opt/hadoop/bin/ozone","om"] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.113 @@ -246,12 +246,12 @@ services: OZONE_OPTS: command: ["/opt/hadoop/bin/ozone","scm"] extra_hosts: - - "om1: 172.25.0.111" - - "om2: 172.25.0.112" - - "om3: 172.25.0.113" - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "om1=172.25.0.111" + - "om2=172.25.0.112" + - "om3=172.25.0.113" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.116 @@ -275,12 +275,12 @@ services: OZONE_OPTS: command: ["/opt/hadoop/bin/ozone","scm"] extra_hosts: - - "om1: 172.25.0.111" - - "om2: 172.25.0.112" - - "om3: 172.25.0.113" - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "om1=172.25.0.111" + - "om2=172.25.0.112" + - "om3=172.25.0.113" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.117 @@ -304,12 +304,12 @@ services: OZONE_OPTS: command: ["/opt/hadoop/bin/ozone","scm"] extra_hosts: - - "om1: 172.25.0.111" - - "om2: 172.25.0.112" - - "om3: 172.25.0.113" - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "om1=172.25.0.111" + - "om2=172.25.0.112" + - "om3=172.25.0.113" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.118 @@ -329,12 +329,12 @@ services: OZONE_OPTS: command: ["/opt/hadoop/bin/ozone","recon"] extra_hosts: - - "om1: 172.25.0.111" - - "om2: 172.25.0.112" - - "om3: 172.25.0.113" - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "om1=172.25.0.111" + - "om2=172.25.0.112" + - "om3=172.25.0.113" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.115 diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/s3g-virtual-host.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/s3g-virtual-host.yaml index 23f3728e9c33..0c61758d4ab7 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/s3g-virtual-host.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/s3g-virtual-host.yaml @@ -40,6 +40,6 @@ services: s3g: <<: *s3g-virtual-host-config extra_hosts: - - "bucket1.s3g.internal: 172.25.0.114" + - "bucket1.s3g.internal=172.25.0.114" recon: <<: *s3g-virtual-host-config diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml index 7964bdff9f8e..2158e3c8e789 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/scm-decommission.yaml @@ -33,12 +33,12 @@ services: OZONE_OPTS: command: [ "/opt/hadoop/bin/ozone","scm" ] extra_hosts: - - "om1: 172.25.0.111" - - "om2: 172.25.0.112" - - "om3: 172.25.0.113" - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" + - "om1=172.25.0.111" + - "om2=172.25.0.112" + - "om3=172.25.0.113" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" networks: ozone_net: ipv4_address: 172.25.0.120 @@ -53,11 +53,11 @@ services: - 10008:9999 command: [ "/opt/hadoop/bin/ozone","datanode" ] extra_hosts: - - "scm1.org: 172.25.0.116" - - "scm2.org: 172.25.0.117" - - "scm3.org: 172.25.0.118" - - "scm4.org: 172.25.0.120" - - "recon: 172.25.0.115" + - "scm1.org=172.25.0.116" + - "scm2.org=172.25.0.117" + - "scm3.org=172.25.0.118" + - "scm4.org=172.25.0.120" + - "recon=172.25.0.115" env_file: - docker-config - docker-config-scm4