From 80db1ba0096b815edbb955b6b704852d46f7e63d Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Sun, 8 Jun 2025 14:47:43 -0700 Subject: [PATCH 1/4] HDDS-13210. Add httpfs container to docker compose file. --- docker-compose.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 64fc93f..015d748 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -73,3 +73,14 @@ services: environment: <<: *common-config command: ["ozone","s3g"] + httpfs: + <<: *image + ports: + - 14000:14000 + environment: + CORE-SITE.XML_fs.defaultFS: "ofs://om" + CORE-SITE.XML_hadoop.proxyuser.hadoop.hosts: "*" + CORE-SITE.XML_hadoop.proxyuser.hadoop.groups: "*" + OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1} + <<: *common-config + command: [ "ozone","httpfs" ] From 23394c51198b151db62bd80beebb70e4a3e99deb Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 10 Jun 2025 10:48:39 -0700 Subject: [PATCH 2/4] Update docker-compilse.yaml move the proxyuser settings to common-config. --- docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 015d748..e9d27c6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,6 +20,9 @@ x-image: x-common-config: &common-config + CORE-SITE.XML_fs.defaultFS: "ofs://om" + CORE-SITE.XML_hadoop.proxyuser.hadoop.hosts: "*" + CORE-SITE.XML_hadoop.proxyuser.hadoop.groups: "*" OZONE-SITE.XML_hdds.datanode.dir: "/data/hdds" OZONE-SITE.XML_ozone.metadata.dirs: "/data/metadata" OZONE-SITE.XML_ozone.om.address: "om" @@ -78,9 +81,6 @@ services: ports: - 14000:14000 environment: - CORE-SITE.XML_fs.defaultFS: "ofs://om" - CORE-SITE.XML_hadoop.proxyuser.hadoop.hosts: "*" - CORE-SITE.XML_hadoop.proxyuser.hadoop.groups: "*" OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1} <<: *common-config command: [ "ozone","httpfs" ] From 896631054e445857a9b412b01490fcdfbc8262ca Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 10 Jun 2025 10:50:05 -0700 Subject: [PATCH 3/4] Fix style --- docker-compose.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index e9d27c6..57a725b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -77,10 +77,9 @@ services: <<: *common-config command: ["ozone","s3g"] httpfs: - <<: *image - ports: - - 14000:14000 - environment: - OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1} - <<: *common-config - command: [ "ozone","httpfs" ] + <<: *image + ports: + - 14000:14000 + environment: + <<: *common-config + command: [ "ozone","httpfs" ] From 2c5bb92d952e96bac59da71e95d9afe2fd785a49 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 10 Jun 2025 11:19:36 -0700 Subject: [PATCH 4/4] Make configs role-specifics --- docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 57a725b..3c6e039 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,9 +20,6 @@ x-image: x-common-config: &common-config - CORE-SITE.XML_fs.defaultFS: "ofs://om" - CORE-SITE.XML_hadoop.proxyuser.hadoop.hosts: "*" - CORE-SITE.XML_hadoop.proxyuser.hadoop.groups: "*" OZONE-SITE.XML_hdds.datanode.dir: "/data/hdds" OZONE-SITE.XML_ozone.metadata.dirs: "/data/metadata" OZONE-SITE.XML_ozone.om.address: "om" @@ -51,6 +48,8 @@ services: - 9874:9874 environment: <<: *common-config + CORE-SITE.XML_hadoop.proxyuser.hadoop.hosts: "*" + CORE-SITE.XML_hadoop.proxyuser.hadoop.groups: "*" ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION WAITFOR: scm:9876 command: ["ozone","om"] @@ -82,4 +81,5 @@ services: - 14000:14000 environment: <<: *common-config + CORE-SITE.XML_fs.defaultFS: "ofs://om" command: [ "ozone","httpfs" ]