This is an automated email from the ASF dual-hosted git repository.
sekikn 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 3f9000482 BIGTOP-3920. Upgrade Hadoop to 3.3.5. (#1101)
3f9000482 is described below
commit 3f90004828f6eac2bea26104ec145ea3dd042d43
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Wed Apr 26 15:33:57 2023 +0900
BIGTOP-3920. Upgrade Hadoop to 3.3.5. (#1101)
---
.../common/hadoop/patch0-revert-YARN-10495.diff | 72 ---------------------
.../common/hadoop/patch9-revert-HADOOP-17196.diff | 73 ----------------------
bigtop.bom | 2 +-
3 files changed, 1 insertion(+), 146 deletions(-)
diff --git a/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
b/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
deleted file mode 100644
index 612eedd50..000000000
--- a/bigtop-packages/src/common/hadoop/patch0-revert-YARN-10495.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-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-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
b/bigtop-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
deleted file mode 100644
index 933bc7b47..000000000
--- a/bigtop-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-commit f790a72a4c68e242b5d54323c607e18d5dbda394
-Author: Masatake Iwasaki <[email protected]>
-Date: Fri May 14 11:48:47 2021 +0000
-
- Revert "HADOOP-17196. Fix C/C++ standard warnings (#2208)"
-
- This reverts commit ff907b310d905fde648dc6db8954e425c24e3bf3.
-
-diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-index 7628ecf..4de70ac 100644
---- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-+++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-@@ -193,7 +193,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- # Solaris flags. 64-bit compilation is mandatory, and is checked earlier.
- hadoop_add_compiler_flags("-m64 -D_POSIX_C_SOURCE=200112L
-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS")
-- set(CMAKE_CXX_STANDARD 98)
-+ set(CMAKE_CXX_FLAGS "-std=gnu++98 ${CMAKE_CXX_FLAGS}")
- hadoop_add_linker_flags("-m64")
-
- # CMAKE_SYSTEM_PROCESSOR is set to the output of 'uname -p', which on
Solaris is
-@@ -212,4 +212,4 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- endif()
-
- # Set GNU99 as the C standard to use
--set(CMAKE_C_STANDARD 99)
-\ No newline at end of file
-+set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
-\ No newline at end of file
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-index 18396c7..1676e31 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-@@ -152,8 +152,7 @@ add_subdirectory(main/native/libhdfs-tests)
- # Temporary fix to disable Libhdfs++ build on older systems that do not
support thread_local
- include(CheckCXXSourceCompiles)
- unset (THREAD_LOCAL_SUPPORTED CACHE)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_STANDARD_REQUIRED ON)
-+set (CMAKE_REQUIRED_DEFINITIONS "-std=c++11")
- set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- check_cxx_source_compiles(
- "#include <thread>
-diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-index 2da5b6bb..c17f9d3 100644
----
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-+++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-@@ -51,8 +51,7 @@ include(CheckCXXSourceCompiles)
-
- # Check if thread_local is supported
- unset (THREAD_LOCAL_SUPPORTED CACHE)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_STANDARD_REQUIRED ON)
-+set (CMAKE_REQUIRED_DEFINITIONS "-std=c++11")
- set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- check_cxx_source_compiles(
- "#include <thread>
-@@ -148,13 +147,12 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
-
- if(UNIX)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -g -fPIC
-fno-strict-aliasing")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11
-g -fPIC -fno-strict-aliasing")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fPIC -fno-strict-aliasing")
- endif()
-
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-- set(CMAKE_CXX_STANDARD 11)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- add_definitions(-DASIO_HAS_STD_ADDRESSOF -DASIO_HAS_STD_ARRAY
-DASIO_HAS_STD_ATOMIC -DASIO_HAS_CSTDINT -DASIO_HAS_STD_SHARED_PTR
-DASIO_HAS_STD_TYPE_TRAITS -DASIO_HAS_VARIADIC_TEMPLATES
-DASIO_HAS_STD_FUNCTION -DASIO_HAS_STD_CHRONO -DASIO_HAS_STD_SYSTEM_ERROR)
- endif ()
-
diff --git a/bigtop.bom b/bigtop.bom
index d0860c436..eea8002d4 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 = 2 }
+ version { base = '3.3.5'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/common/$name-${version.base}"
