Skip to content

Commit 4d29b6c

Browse files
adoroszlaiadoroszlai
authored
HDDS-11103. Do not assume working dir is writable in container (#6913)
1 parent 56ce591 commit 4d29b6c

36 files changed

Lines changed: 120 additions & 109 deletions

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ jobs:
428428
mkdir -p hadoop-ozone/dist/target
429429
tar xzvf ozone*.tar.gz -C hadoop-ozone/dist/target
430430
rm ozone*.tar.gz
431-
sudo chmod -R a+rwX hadoop-ozone/dist/target
432431
- name: Execute tests
433432
run: |
434433
pushd hadoop-ozone/dist/target/ozone-*

‎hadoop-ozone/dist/src/main/compose/compatibility/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
3030
OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB
3131
OZONE-SITE.XML_ozone.recon.address=recon:9891
3232
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
33+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
3334

3435
HADOOP_OPTS="-Dhadoop.opts=test"
3536
HDFS_STORAGECONTAINERMANAGER_OPTS="-Dhdfs.scm.opts=test"

‎hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ OZONE-SITE.XML_hdds.container.report.interval=30s
5252
OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true
5353
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
5454
OZONE-SITE.XML_dfs.container.ratis.datastream.enabled=true
55+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
5556

5657
OZONE_CONF_DIR=/etc/hadoop
5758
OZONE_LOG_DIR=/var/log/hadoop

‎hadoop-ozone/dist/src/main/compose/ozone-csi/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
3535
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
3636
OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB
3737
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
38+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
3839

3940
OZONE_CONF_DIR=/etc/hadoop
4041
OZONE_LOG_DIR=/var/log/hadoop

‎hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ OZONE-SITE.XML_ozone.recon.address=recon:9891
5050
OZONE-SITE.XML_ozone.recon.http-address=0.0.0.0:9888
5151
OZONE-SITE.XML_ozone.recon.https-address=0.0.0.0:9889
5252
OZONE-SITE.XML_hdds.container.ratis.datastream.enabled=true
53+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
5354

5455
OZONE_CONF_DIR=/etc/hadoop
5556
OZONE_LOG_DIR=/var/log/hadoop

‎hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
3838
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
3939
OZONE-SITE.XML_hdds.container.report.interval=60s
4040
OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true
41+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
4142
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
4243
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
4344
ASYNC_PROFILER_HOME=/opt/profiler

‎hadoop-ozone/dist/src/main/compose/ozone-om-prepare/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ OZONE-SITE.XML_ozone.scm.client.address=scm
3232
OZONE-SITE.XML_ozone.client.failover.max.attempts=6
3333
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
3434
OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB
35+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
3536

3637
no_proxy=om1,om2,om3,scm,s3g,recon,kdc,localhost,127.0.0.1

‎hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ OZONE-SITE.XML_net.topology.node.switch.mapping.impl=org.apache.hadoop.net.Table
4343
OZONE-SITE.XML_net.topology.table.file.name=/opt/hadoop/compose/ozone-topology/network-config
4444
OZONE-SITE.XML_ozone.network.topology.aware.read=true
4545
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
46+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
4647

4748
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
4849
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300

‎hadoop-ozone/dist/src/main/compose/ozone/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ OZONE-SITE.XML_hdds.scm.replication.thread.interval=15s
5151
OZONE-SITE.XML_hdds.scm.replication.under.replicated.interval=5s
5252
OZONE-SITE.XML_hdds.scm.replication.over.replicated.interval=5s
5353
OZONE-SITE.XML_hdds.scm.wait.time.after.safemode.exit=30s
54+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
5455

5556
OZONE-SITE.XML_hdds.container.ratis.datastream.enabled=true
5657

‎hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ OZONE-SITE.XML_hdds.scm.replication.event.timeout=10s
3939
OZONE-SITE.XML_dfs.ratis.server.failure.duration=35s
4040
OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
4141
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
42+
OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
4243

4344
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
4445
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300

0 commit comments

Comments
 (0)