This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch debug-acceptance-timeout
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 4916923013eb689f85b8d50f8304bdfd1be03e2d
Author: Márton Elek <e...@apache.org>
AuthorDate: Tue Dec 3 12:54:22 2019 +0100
switch to use ENV based variable with default
---
.../dist/src/main/compose/ozone-mr/hadoop27/docker-compose.yaml | 1 +
.../dist/src/main/compose/ozone-mr/hadoop31/docker-compose.yaml | 1 +
.../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-s3/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozone-topology/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozone/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozones3/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/testlib.sh | 2 +-
22 files changed, 13 insertions(+), 10 deletions(-)
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 17f5ee5..85f75b0 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
@@ -63,6 +63,7 @@ services:
- ../common-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
rm:
image: ${HADOOP_IMAGE}:${HADOOP_VERSION}
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 e3696fc..9a30c8e 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
@@ -63,6 +63,7 @@ services:
- ../common-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
rm:
image: ${HADOOP_IMAGE}:${HADOOP_VERSION}
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 c25d36c..3462a91 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
@@ -63,6 +63,7 @@ services:
- ../common-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
rm:
image: ${HADOOP_IMAGE}:${HADOOP_VERSION}
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 390acb3..ff7f260 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
@@ -76,6 +76,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
s3g:
image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
index 5cfa826..4122dae 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
@@ -29,6 +29,5 @@ OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.handler.type=distributed
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.replication=3
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
index 38e2ef3..3f010a2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml
@@ -50,6 +50,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
recon:
image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config
index 0c817a9..bf7871e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config
@@ -27,7 +27,6 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.replication=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
ASYNC_PROFILER_HOME=/opt/profiler
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 a66eff6..69611fa 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
@@ -98,6 +98,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
networks:
net:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
index f8c939f..611c6c0 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
@@ -29,7 +29,6 @@
OZONE-SITE.XML_ozone.scm.container.placement.impl=org.apache.hadoop.hdds.scm.con
OZONE-SITE.XML_net.topology.node.switch.mapping.impl=org.apache.hadoop.net.TableMapping
OZONE-SITE.XML_net.topology.table.file.name=/opt/hadoop/compose/ozone-topology/network-config
OZONE-SITE.XML_dfs.network.topology.aware.read.enable=true
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
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 145ce3e..6dc9d14 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -50,4 +50,5 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
index 02b532a..d82cde2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
@@ -25,7 +25,6 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.replication=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
ASYNC_PROFILER_HOME=/opt/profiler
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
index 3c6618d..b78cf09 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml
@@ -49,6 +49,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["ozone","scm"]
jaeger:
image: jaegertracing/all-in-one:latest
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
index 5d68afc..931f112 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config
@@ -25,7 +25,6 @@ OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.replication=3
OZONE-SITE.XML_hdds.prometheus.endpoint.enabled=true
OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
ASYNC_PROFILER_HOME=/opt/profiler
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 78fd996..25ed6f6 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
@@ -53,6 +53,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["ozone","scm"]
s3g1:
image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-config
b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-config
index 4c08c52..75d1977 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozones3-haproxy/docker-config
@@ -22,7 +22,6 @@ OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.replication=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
index cc4bfd2..26bcee5 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml
@@ -46,6 +46,7 @@ services:
- ./docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["ozone","scm"]
s3g:
image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
index 4c08c52..75d1977 100644
--- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config
@@ -22,7 +22,6 @@ OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.replication=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
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 53e0142..1b8fc9c 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
@@ -86,6 +86,7 @@ services:
- docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
rm:
image: apache/hadoop:${HADOOP_VERSION}
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
index 54992d8..7d6fdc4 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
@@ -31,7 +31,6 @@
OZONE-SITE.XML_ozone.om.kerberos.keytab.file=/etc/security/keytabs/om.keytab
OZONE-SITE.XML_ozone.s3g.keytab.file=/etc/security/keytabs/HTTP.keytab
OZONE-SITE.XML_ozone.s3g.authentication.kerberos.principal=HTTP/s...@example.com
OZONE-SITE.XML_ozone.administrators=*
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
OZONE-SITE.XML_ozone.security.enabled=true
OZONE-SITE.XML_hdds.scm.http.kerberos.principal=HTTP/s...@example.com
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 de60a41..65f24f9 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
@@ -88,4 +88,5 @@ services:
- docker-config
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+ OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
command: ["/opt/hadoop/bin/ozone","scm"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 14ef63c..ff42249 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -36,7 +36,6 @@
OZONE-SITE.XML_ozone.recon.authentication.kerberos.principal=HTTP/recon@EXAMPLE.
OZONE-SITE.XML_ozone.recon.keytab.file=/etc/security/keytabs/HTTP.keytab
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_recon.om.snapshot.task.initial.delay=20s
-OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
OZONE-SITE.XML_ozone.security.enabled=true
OZONE-SITE.XML_ozone.acl.enabled=true
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index f4b0fbc..4375c3d 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -72,7 +72,7 @@ start_docker_env(){
local -i datanode_count=${1:-3}
create_results_dir
-
+ export OZONE_SAFEMODE_MIN_DATANODE="${datanode_count}"
docker-compose -f "$COMPOSE_FILE" --no-ansi down
docker-compose -f "$COMPOSE_FILE" --no-ansi up -d --scale
datanode="${datanode_count}" \
&& wait_for_safemode_exit "$COMPOSE_FILE" \
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org
