Skip to content

Commit bffcd33

Browse files
committed
HDDS-2230. Invalid entries in ozonesecure-mr config
Doroszlai, Attila <[email protected]>
1 parent a9849f6 commit bffcd33

File tree

2 files changed

+39
-18
lines changed

2 files changed

+39
-18
lines changed

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
version: "3"
17+
version: "3.5"
1818
services:
1919
kdc:
2020
build:
@@ -23,17 +23,23 @@ services:
2323
args:
2424
buildno: 1
2525
hostname: kdc
26+
networks:
27+
- ozone
2628
volumes:
2729
- ../..:/opt/hadoop
2830
kms:
29-
image: apache/hadoop:${HADOOP_VERSION}
30-
ports:
31+
image: apache/hadoop:${HADOOP_VERSION}
32+
networks:
33+
- ozone
34+
ports:
3135
- 9600:9600
32-
env_file:
36+
env_file:
3337
- ./docker-config
34-
command: ["hadoop", "kms"]
38+
command: ["hadoop", "kms"]
3539
datanode:
3640
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
41+
networks:
42+
- ozone
3743
volumes:
3844
- ../..:/opt/hadoop
3945
ports:
@@ -44,6 +50,8 @@ services:
4450
om:
4551
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
4652
hostname: om
53+
networks:
54+
- ozone
4755
volumes:
4856
- ../..:/opt/hadoop
4957
ports:
@@ -56,6 +64,8 @@ services:
5664
s3g:
5765
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
5866
hostname: s3g
67+
networks:
68+
- ozone
5969
volumes:
6070
- ../..:/opt/hadoop
6171
ports:
@@ -66,6 +76,8 @@ services:
6676
scm:
6777
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
6878
hostname: scm
79+
networks:
80+
- ozone
6981
volumes:
7082
- ../..:/opt/hadoop
7183
ports:
@@ -78,6 +90,8 @@ services:
7890
rm:
7991
image: apache/hadoop:${HADOOP_VERSION}
8092
hostname: rm
93+
networks:
94+
- ozone
8195
volumes:
8296
- ../..:/opt/ozone
8397
ports:
@@ -90,6 +104,8 @@ services:
90104
nm:
91105
image: apache/hadoop:${HADOOP_VERSION}
92106
hostname: nm
107+
networks:
108+
- ozone
93109
volumes:
94110
- ../..:/opt/ozone
95111
env_file:
@@ -100,7 +116,10 @@ services:
100116
command: ["yarn","nodemanager"]
101117
jhs:
102118
image: apache/hadoop:${HADOOP_VERSION}
119+
container_name: jhs
103120
hostname: jhs
121+
networks:
122+
- ozone
104123
volumes:
105124
- ../..:/opt/ozone
106125
ports:

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OZONE-SITE.XML_ozone.om.kerberos.principal=om/[email protected]
3131
OZONE-SITE.XML_ozone.om.kerberos.keytab.file=/etc/security/keytabs/om.keytab
3232
OZONE-SITE.XML_ozone.s3g.keytab.file=/etc/security/keytabs/HTTP.keytab
3333
OZONE-SITE.XML_ozone.s3g.authentication.kerberos.principal=HTTP/[email protected]
34-
OZONE_SITE.XML_ozone.administrators=*
34+
OZONE-SITE.XML_ozone.administrators=*
3535

3636
OZONE-SITE.XML_ozone.security.enabled=true
3737
OZONE-SITE.XML_hdds.scm.http.kerberos.principal=HTTP/[email protected]
@@ -62,8 +62,8 @@ HADOOP-POLICY.XML_org.apache.hadoop.yarn.server.api.ResourceTracker.acl=*
6262
HDFS-SITE.XML_rpc.metrics.quantile.enable=true
6363
HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300
6464

65-
CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
66-
CORE-SITE.xml_fs.defaultFS=o3fs://bucket1.vol1/
65+
CORE-SITE.XML_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
66+
CORE-SITE.XML_fs.defaultFS=o3fs://bucket1.vol1/
6767

6868
MAPRED-SITE.XML_mapreduce.framework.name=yarn
6969
MAPRED-SITE.XML_yarn.app.mapreduce.am.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
@@ -75,12 +75,12 @@ MAPRED-SITE.XML_mapreduce.reduce.memory.mb=2048
7575
MAPRED-SITE.XML_mapreduce.application.classpath=/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/mapreduce/lib/*:/opt/ozone/share/ozone/lib/[email protected]@.jar
7676

7777
YARN-SITE.XML_yarn.app.mapreduce.am.staging-dir=/user
78-
YARN_SITE.XML_yarn.timeline-service.enabled=true
79-
YARN_SITE.XML_yarn.timeline-service.generic.application.history.enabled=true
80-
YARN_SITE.XML_yarn.timeline-service.hostname=jhs
78+
YARN-SITE.XML_yarn.timeline-service.enabled=true
79+
YARN-SITE.XML_yarn.timeline-service.generic.application.history.enabled=true
80+
YARN-SITE.XML_yarn.timeline-service.hostname=jhs
8181
YARN-SITE.XML_yarn.timeline-service.principal=jhs/[email protected]
8282
YARN-SITE.XML_yarn.timeline-service.keytab=/etc/security/keytabs/jhs.keytab
83-
YARN_SITE.XML_yarn.log.server.url=http://jhs:8188/applicationhistory/logs/
83+
YARN-SITE.XML_yarn.log.server.url=http://jhs:8188/applicationhistory/logs/
8484

8585
YARN-SITE.XML_yarn.nodemanager.principal=nm/[email protected]
8686
YARN-SITE.XML_yarn.nodemanager.keytab=/etc/security/keytabs/nm.keytab
@@ -93,15 +93,17 @@ YARN-SITE.XML_yarn.nodemanager.disk-health-checker.enable=false
9393
YARN-SITE.XML_yarn.resourcemanager.hostname=rm
9494
YARN-SITE.XML_yarn.resourcemanager.keytab=/etc/security/keytabs/rm.keytab
9595
YARN-SITE.XML_yarn.resourcemanager.principal=rm/[email protected]
96-
YARN_SITE_XML_yarn.resourcemanager.system.metrics.publisher.enabled=true
96+
YARN-SITE.XML_yarn.resourcemanager.system.metrics.publisher.enabled=true
9797

9898
YARN-SITE.XML_yarn.log-aggregation-enable=true
99-
YARN-SITE.yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds=3600
100-
YARN-SITE.yarn.nodemanager.delete.debug-delay-sec=600
99+
YARN-SITE.XML_yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds=3600
100+
YARN-SITE.XML_yarn.nodemanager.delete.debug-delay-sec=600
101101

102-
YARN-SITE.yarn.nodemanager.container-executor.class=org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor
103-
YARN-SITE.yarn.nodemanager.linux-container-executor.path=/opt/hadoop/bin/container-executor
104-
YARN-SITE.yarn.nodemanager.linux-container-executor.group=hadoop
102+
# Yarn LinuxContainer requires the /opt/hadoop/etc/hadoop to be owned by root and not modifiable by other users,
103+
# which prevents start.sh from changing the configurations based on docker-config
104+
# YARN-SITE.XML_yarn.nodemanager.container-executor.class=org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor
105+
# YARN-SITE.XML_yarn.nodemanager.linux-container-executor.path=/opt/hadoop/bin/container-executor
106+
# YARN-SITE.XML_yarn.nodemanager.linux-container-executor.group=hadoop
105107

106108
CAPACITY-SCHEDULER.XML_yarn.scheduler.capacity.maximum-applications=10000
107109
CAPACITY-SCHEDULER.XML_yarn.scheduler.capacity.maximum-am-resource-percent=0.1

0 commit comments

Comments
 (0)