From cb4cc04d92bd0b171db1ce0371ebb4488e7158ad Mon Sep 17 00:00:00 2001 From: Gautham Banasandra Date: Sat, 6 Nov 2021 23:47:50 +0530 Subject: [PATCH 1/3] HDFS-16304. Locate OpenSSL libs for libhdfspp --- hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 9a92171b8d360..1e8a689e0c75f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt @@ -115,6 +115,7 @@ find_library(OPENSSL_LIBRARY NAMES ${OPENSSL_NAME} PATHS ${CUSTOM_OPENSSL_PREFIX} ${CUSTOM_OPENSSL_PREFIX}/lib ${CUSTOM_OPENSSL_PREFIX}/lib64 ${CUSTOM_OPENSSL_LIB} NO_DEFAULT_PATH) +find_library(OPENSSL_LIBRARY NAMES ${OPENSSL_NAME}) find_path(OPENSSL_INCLUDE_DIR NAMES openssl/evp.h PATHS ${CUSTOM_OPENSSL_PREFIX} ${CUSTOM_OPENSSL_PREFIX}/include From 3325317fedb5f80c1b38d8b4a55eab874354fc4a Mon Sep 17 00:00:00 2001 From: Gautham Banasandra Date: Sat, 6 Nov 2021 23:50:42 +0530 Subject: [PATCH 2/3] Run unit tests for libhdfspp --- .../src/main/native/libhdfspp/tests/bad_datanode_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc index 973212647e764..8757dd28d33e6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc @@ -227,6 +227,7 @@ TEST(BadDataNodeTest, NNEventCallback) { ASSERT_EQ(2, callbacks.size()); ASSERT_EQ(FILE_DN_CONNECT_EVENT, callbacks[0]); ASSERT_EQ(FILE_DN_READ_EVENT, callbacks[1]); + } From 611b01fa18bee1fbe41068e80b78bb7cca63a3a1 Mon Sep 17 00:00:00 2001 From: Gautham Banasandra Date: Sat, 6 Nov 2021 23:50:58 +0530 Subject: [PATCH 3/3] Revert "Run unit tests for libhdfspp" This reverts commit 3325317fedb5f80c1b38d8b4a55eab874354fc4a. --- .../src/main/native/libhdfspp/tests/bad_datanode_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc index 8757dd28d33e6..973212647e764 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/bad_datanode_test.cc @@ -227,7 +227,6 @@ TEST(BadDataNodeTest, NNEventCallback) { ASSERT_EQ(2, callbacks.size()); ASSERT_EQ(FILE_DN_CONNECT_EVENT, callbacks[0]); ASSERT_EQ(FILE_DN_READ_EVENT, callbacks[1]); - }