Skip to content

Commit 3bc3b8a

Browse files
authored
HDDS-11621. Fix missing HADOOP_ variables in MR acceptance test (#7375)
1 parent 6f9db61 commit 3bc3b8a

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

hadoop-ozone/dist/src/main/compose/common/hadoop.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
1818
CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs
1919

2020
MAPRED-SITE.XML_mapreduce.framework.name=yarn
21-
MAPRED-SITE.XML_yarn.app.mapreduce.am.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
22-
MAPRED-SITE.XML_mapreduce.map.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
23-
MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
2421
MAPRED-SITE.XML_mapreduce.map.memory.mb=4096
2522
MAPRED-SITE.XML_mapreduce.reduce.memory.mb=4096
2623
MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2g

hadoop-ozone/dist/src/main/compose/ozone-ha/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# limitations under the License.
1616

1717
HDDS_VERSION=${hdds.version}
18+
HADOOP_IMAGE=apache/hadoop
1819
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
1920
OZONE_RUNNER_IMAGE=apache/ozone-runner
2021
OZONE_OPTS=

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# limitations under the License.
1616

1717
HDDS_VERSION=${hdds.version}
18+
HADOOP_IMAGE=apache/hadoop
1819
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
1920
OZONE_RUNNER_IMAGE=apache/ozone-runner
2021
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}

0 commit comments

Comments
 (0)