This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new bb89f776dd HDDS-8186. `ozone sh key put` does not work in
single-datanode compose example (#5071)
bb89f776dd is described below
commit bb89f776dd573c5f4294764f21d1470434a16cf5
Author: SaketaChalamchala <[email protected]>
AuthorDate: Sun Sep 10 00:42:50 2023 -0700
HDDS-8186. `ozone sh key put` does not work in single-datanode compose
example (#5071)
---
hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 2 +-
hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml | 2 +-
.../dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml | 2 +-
.../dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml | 2 +-
.../dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml | 2 +-
hadoop-ozone/dist/src/main/compose/xcompat/docker-config | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
index 1a4584cd57..e742697400 100644
--- a/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/docker-compose.yaml
@@ -27,7 +27,7 @@ x-common-config:
x-replication:
&replication
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
services:
datanode:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
index d5de2b1cbd..cf89407868 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
@@ -27,7 +27,7 @@ x-common-config:
x-replication:
&replication
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
services:
datanode:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
index 1f4029d490..b0a8650591 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
@@ -30,7 +30,7 @@
OZONE-SITE.XML_ozone.scm.datanode.ratis.volume.free-space.min=10MB
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=1
+OZONE-SITE.XML_ozone.server.default.replication=1
OZONE-SITE.XML_ozone.client.failover.max.attempts=6
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-om-prepare/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
index 388809f820..fea928fea5 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-compose.yaml
@@ -25,7 +25,7 @@ x-common-config:
x-replication:
&replication
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
x-datanode:
&datanode
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 704d372682..5be65718bf 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config
@@ -30,7 +30,7 @@ OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_ozone.handler.type=distributed
OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_ozone.replication=3
+OZONE-SITE.XML_ozone.server.default.replication=3
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.recon.address=recon:9891
OZONE-SITE.XML_ozone.recon.http-address=0.0.0.0:9888
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 76f26ddda8..64d9c68bcb 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -27,7 +27,7 @@ x-common-config:
x-replication:
&replication
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
services:
datanode:
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
index d551625e86..437b329cda 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/freon-ockg.yaml
@@ -24,5 +24,5 @@ services:
- docker-config
- monitoring.conf
environment:
- - "OZONE-SITE.XML_ozone.replication=${OZONE_REPLICATION_FACTOR:-1}"
+ -
"OZONE-SITE.XML_ozone.server.default.replication=${OZONE_REPLICATION_FACTOR:-1}"
command: ["ozone","freon","ockg","-n100000"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
index c48266c660..a47ad29876 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/freon-rk.yaml
@@ -24,5 +24,5 @@ services:
- docker-config
- monitoring.conf
environment:
- - "OZONE-SITE.XML_ozone.replication=${OZONE_REPLICATION_FACTOR:-1}"
+ -
"OZONE-SITE.XML_ozone.server.default.replication=${OZONE_REPLICATION_FACTOR:-1}"
command: ["ozone","freon","rk"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
index 762bfeaa4b..d6b5d21769 100644
--- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config
@@ -27,7 +27,7 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.client.max.retries=10
OZONE-SITE.XML_ozone.scm.stale.node.interval=2m
OZONE-SITE.XML_ozone.scm.dead.node.interval=5m
-OZONE-SITE.XML_ozone.replication=1
+OZONE-SITE.XML_ozone.server.default.replication=1
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.scm.pipeline.owner.container.count=1
OZONE-SITE.XML_ozone.scm.pipeline.destroy.timeout=15s
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config
index 101236b189..a09cd29fcd 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config
@@ -23,7 +23,7 @@ OZONE-SITE.XML_ozone.om.http-address=om:9874
OZONE-SITE.XML_ozone.scm.block.client.address=scm
OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_ozone.replication=1
+OZONE-SITE.XML_ozone.server.default.replication=1
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
index 55c0b6064b..098dc1a73a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config
@@ -54,7 +54,7 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.block.token.enabled=true
OZONE-SITE.XML_hdds.container.token.enabled=true
OZONE-SITE.XML_hdds.grpc.tls.enabled=true
-OZONE-SITE.XML_ozone.replication=3
+OZONE-SITE.XML_ozone.server.default.replication=3
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
OZONE-SITE.XML_hdds.container.report.interval=60s
OZONE-SITE.XML_dfs.container.ratis.datastream.enabled=true
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 d44ed296d8..ba9606ff15 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config
@@ -29,7 +29,7 @@ OZONE-SITE.XML_ozone.handler.type=distributed
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.block.token.enabled=true
OZONE-SITE.XML_hdds.container.token.enabled=true
-OZONE-SITE.XML_ozone.replication=3
+OZONE-SITE.XML_ozone.server.default.replication=3
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
OZONE-SITE.XML_hdds.scm.kerberos.principal=scm/[email protected]
OZONE-SITE.XML_hdds.scm.kerberos.keytab.file=/etc/security/keytabs/scm.keytab
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index 99f35bb112..3383b9e246 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -35,7 +35,7 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_hdds.block.token.enabled=true
OZONE-SITE.XML_hdds.container.token.enabled=true
OZONE-SITE.XML_hdds.grpc.tls.enabled=true
-OZONE-SITE.XML_ozone.replication=3
+OZONE-SITE.XML_ozone.server.default.replication=3
OZONE-SITE.XML_ozone.datanode.pipeline.limit=1
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
diff --git a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
index f41ca916d0..7a98bb602c 100644
--- a/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
@@ -25,7 +25,7 @@ x-common-config:
x-replication:
&replication
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
x-datanode:
&datanode
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
index 38f03455d6..6d83ffc0b2 100644
--- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml
@@ -25,7 +25,7 @@ x-common-config:
x-environment:
&environment
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-3}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-3}
OZONE_UPGRADE_TO: ${OZONE_UPGRADE_TO:-0}
OZONE_UPGRADE_FROM: ${OZONE_UPGRADE_FROM:-0}
OZONE-SITE.XML_hdds.scm.safemode.min.datanode:
${OZONE_SAFEMODE_MIN_DATANODES:-1}
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
index 6a195cf807..34e3c5e5ee 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/non-ha/docker-compose.yaml
@@ -25,7 +25,7 @@ x-common-config:
x-environment:
&environment
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-1}
OZONE_UPGRADE_TO: ${OZONE_UPGRADE_TO:-0}
OZONE_UPGRADE_FROM: ${OZONE_UPGRADE_FROM:-0}
diff --git
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
index 39d0b2d895..d95006b13d 100644
---
a/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
+++
b/hadoop-ozone/dist/src/main/compose/upgrade/compose/om-ha/docker-compose.yaml
@@ -25,7 +25,7 @@ x-common-config:
x-environment:
&environment
- OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-3}
+ OZONE-SITE.XML_ozone.server.default.replication:
${OZONE_REPLICATION_FACTOR:-3}
OZONE_UPGRADE_TO: ${OZONE_UPGRADE_TO:-0}
OZONE_UPGRADE_FROM: ${OZONE_UPGRADE_FROM:-0}
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
b/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
index 29b3696a8a..d2cc47b3d1 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
@@ -23,7 +23,7 @@ OZONE-SITE.XML_ozone.om.address=om
OZONE-SITE.XML_ozone.om.http-address=om:9874
OZONE-SITE.XML_ozone.recon.address=recon:9891
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
-OZONE-SITE.XML_ozone.replication=3
+OZONE-SITE.XML_ozone.server.default.replication=3
OZONE-SITE.XML_ozone.scm.block.client.address=scm
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.scm.container.size=1GB
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
