This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new dc4fe2d66 Revert YARN-10495.
dc4fe2d66 is described below
commit dc4fe2d6655b3b3f1257f947203fd851a51c1b08
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Sun Feb 19 11:46:15 2023 +0000
Revert YARN-10495.
---
.../common/hadoop/patch0-revert-YARN-10495.diff | 72 ++++++++++++++++++++++
bigtop.bom | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
b/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
new file mode 100644
index 000000000..612eedd50
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
@@ -0,0 +1,72 @@
+diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+index 2d0c4fa705c..9777b14595f 100644
+---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
++++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+@@ -30,7 +30,6 @@
+ <!-- Basedir eeded for generating FindBugs warnings using parent pom -->
+ <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+ <container-executor.conf.dir>../etc/hadoop</container-executor.conf.dir>
+- <extra.libhadoop.rpath>../lib/native</extra.libhadoop.rpath>
+
<container-executor.additional_cflags></container-executor.additional_cflags>
+ </properties>
+
+@@ -200,7 +199,6 @@
+ <source>${basedir}/src</source>
+ <vars>
+
<HADOOP_CONF_DIR>${container-executor.conf.dir}</HADOOP_CONF_DIR>
+-
<EXTRA_LIBHADOOP_RPATH>${extra.libhadoop.rpath}</EXTRA_LIBHADOOP_RPATH>
+
<JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
+ </vars>
+ <env>
+diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
+index e2cfbc52df2..677429bb99c 100644
+---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
++++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
+@@ -25,8 +25,6 @@ set(GTEST_SRC_DIR
${CMAKE_SOURCE_DIR}/../../../../../hadoop-common-project/hadoo
+
+ set(HADOOP_COMMON_SEC_PATH
${HADOOP_COMMON_PATH}/src/main/native/src/org/apache/hadoop/security)
+
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+-
+ # determine if container-executor.conf.dir is an absolute
+ # path in case the OS we're compiling on doesn't have
+ # a hook in get_executable. We'll use this define
+@@ -159,18 +157,6 @@ add_executable(container-executor
+ main/native/container-executor/impl/main.c
+ )
+
+-# By embedding '$ORIGIN' into the RPATH of container-executor, dlopen will
look in
+-# the directory containing container-executor. However, $ORIGIN is not
supported by
+-# all operating systems.
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|SunOS")
+- set(RPATH "\$ORIGIN/")
+- if(EXTRA_LIBHADOOP_RPATH)
+- set(RPATH "${RPATH}:${EXTRA_LIBHADOOP_RPATH}/")
+- endif()
+- message("RPATH SET AS ${RPATH}.")
+- set_target_properties(container-executor PROPERTIES INSTALL_RPATH
"${RPATH}")
+-endif()
+-
+ target_link_libraries(container-executor
+ container
+ crypto
+@@ -182,19 +168,6 @@ output_directory(container-executor target/usr/local/bin)
+ add_executable(test-container-executor
+ main/native/container-executor/test/test-container-executor.c
+ )
+-
+-# By embedding '$ORIGIN' into the RPATH of test-container-executor, dlopen
will look in
+-# the directory containing test-container-executor. However, $ORIGIN is not
supported by
+-# all operating systems.
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|SunOS")
+- set(RPATH "\$ORIGIN/")
+- if(EXTRA_LIBHADOOP_RPATH)
+- set(RPATH "${RPATH}:${EXTRA_LIBHADOOP_RPATH}/")
+- endif()
+- message("RPATH SET AS ${RPATH}.")
+- set_target_properties(test-container-executor PROPERTIES INSTALL_RPATH
"${RPATH}")
+-endif()
+-
+ target_link_libraries(test-container-executor
+ container
+ ${EXTRA_LIBS}
diff --git a/bigtop.bom b/bigtop.bom
index 2c2edd602..b8718480d 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -151,7 +151,7 @@ bigtop {
name = 'hadoop'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache Hadoop'
- version { base = '3.3.4'; pkg = base; release = 1 }
+ version { base = '3.3.4'; pkg = base; release = 2 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/common/$name-${version.base}"
