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 3bc3b8ad84 HDDS-11621. Fix missing HADOOP_ variables in MR acceptance
test (#7375)
3bc3b8ad84 is described below
commit 3bc3b8ad84b86e096c862d3bcbf20f14b75fd0e6
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Nov 4 22:30:31 2024 +0100
HDDS-11621. Fix missing HADOOP_ variables in MR acceptance test (#7375)
---
hadoop-ozone/dist/src/main/compose/common/hadoop.conf | 3 ---
hadoop-ozone/dist/src/main/compose/ozone-ha/.env | 1 +
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop.conf
b/hadoop-ozone/dist/src/main/compose/common/hadoop.conf
index 2a82c0bfa2..ad2d4cb42b 100644
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop.conf
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop.conf
@@ -18,9 +18,6 @@
CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs
CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs
MAPRED-SITE.XML_mapreduce.framework.name=yarn
-MAPRED-SITE.XML_yarn.app.mapreduce.am.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
-MAPRED-SITE.XML_mapreduce.map.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
-MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
MAPRED-SITE.XML_mapreduce.map.memory.mb=4096
MAPRED-SITE.XML_mapreduce.reduce.memory.mb=4096
MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2g
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
index 2de359fc5d..6507664fad 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
@@ -15,6 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
+HADOOP_IMAGE=apache/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_OPTS=
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
index 3470609317..cb5ab1080a 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
@@ -15,6 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
+HADOOP_IMAGE=apache/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
