This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 10e7ca481c8 YARN-11441. Revert YARN-10495.
10e7ca481c8 is described below
commit 10e7ca481c8cd0548d903d39d8581291e533bf12
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Thu Feb 16 10:12:07 2023 +0000
YARN-11441. Revert YARN-10495.
This reverts commit 7d3c8ef6064efd132828765e52e961977aebbf47.
---
.../hadoop-yarn-server-nodemanager/pom.xml | 2 --
.../src/CMakeLists.txt | 27 ----------------------
2 files changed, 29 deletions(-)
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 24be1ebd2a9..a66b6664020 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>
@@ -224,7 +223,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}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
