You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2020/06/29 13:22:58 UTC
[hadoop-ozone] branch master updated: HDDS-3865. Export the SCM
client IPC port in docker-compose (#1124)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 95073f4 HDDS-3865. Export the SCM client IPC port in docker-compose (#1124)
95073f4 is described below
commit 95073f4379a705fd0ad5e036151f611641c7c616
Author: maobaolong <30...@qq.com>
AuthorDate: Mon Jun 29 21:22:44 2020 +0800
HDDS-3865. Export the SCM client IPC port in docker-compose (#1124)
---
hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml | 1 +
.../network-tests/src/test/compose/docker-compose.yaml | 1 +
15 files changed, 15 insertions(+)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
index 1fd7ebd..171ae5d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
@@ -50,6 +50,7 @@ services:
- docker-config
ports:
- 9876:9876
+ - 9860:9860
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
HADOOP_OPTS: ${HADOOP_OPTS}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
index effb4a7..d7293be 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml
@@ -59,6 +59,7 @@ services:
- ../../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
- ../common-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
index dc7261f..307882a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml
@@ -64,6 +64,7 @@ services:
- ../../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
- ../common-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
index 89c4f7a..9cea61f 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/docker-compose.yaml
@@ -62,6 +62,7 @@ services:
- ../../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
- ../common-config
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
index 2359482..4d271be 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
@@ -77,6 +77,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
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 8bb6409..87bb161 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
@@ -92,6 +92,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
index e9d94ea..d4fc887 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml
@@ -136,6 +136,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
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 2597612..21bb1b2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -53,6 +53,7 @@ services:
<<: *common-config
ports:
- 9876:9876
+ - 9860:9860
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
index c34c520..175347f 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml
@@ -43,6 +43,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
index 2a1b5a0..22861e3 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml
@@ -50,6 +50,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
index 826ca5c..9b49a2a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
@@ -51,5 +51,6 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
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 d9cbb34..7854f08 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
@@ -90,6 +90,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
environment:
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml
index 5c7f156..dd49bdc 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-compose.yaml
@@ -183,6 +183,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
environment:
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 6c67d1e..2d7307a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -93,6 +93,7 @@ services:
- ../..:/opt/hadoop
ports:
- 9876:9876
+ - 9860:9860
env_file:
- docker-config
environment:
diff --git a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
index 7175eb8..8381223 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
+++ b/hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-compose.yaml
@@ -36,6 +36,7 @@ services:
image: ${docker.image}
ports:
- 9876:9876
+ - 9860:9860
env_file:
- ./docker-config
environment:
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org