You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2018/06/26 08:06:09 UTC
[12/50] [abbrv] hadoop git commit: YARN-8437. Build oom-listener
fails on older versions. (Miklos Szegedi via Haibo Chen)
YARN-8437. Build oom-listener fails on older versions. (Miklos Szegedi via Haibo Chen)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4939ffed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4939ffed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4939ffed
Branch: refs/heads/HDDS-4
Commit: 4939ffedb151ce1550fcdd7ac04c79d8d0195891
Parents: 2d87592
Author: Haibo Chen <ha...@apache.org>
Authored: Wed Jun 20 10:35:52 2018 -0700
Committer: Haibo Chen <ha...@apache.org>
Committed: Wed Jun 20 10:42:13 2018 -0700
----------------------------------------------------------------------
.../src/CMakeLists.txt | 4 +--
.../oom-listener/test/oom_listener_test_main.cc | 33 ++++++++++----------
2 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4939ffed/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
----------------------------------------------------------------------
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 a614f80..300bb65 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
@@ -188,5 +188,5 @@ add_executable(test-oom-listener
main/native/oom-listener/impl/oom_listener.h
main/native/oom-listener/test/oom_listener_test_main.cc
)
-target_link_libraries(test-oom-listener gtest)
-output_directory(test-oom-listener test)
\ No newline at end of file
+target_link_libraries(test-oom-listener gtest rt)
+output_directory(test-oom-listener test)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4939ffed/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc
index 9627632..421c21e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/oom-listener/test/oom_listener_test_main.cc
@@ -20,6 +20,7 @@
extern "C" {
#include "oom_listener.h"
+#include <time.h>
}
#include <gtest/gtest.h>
@@ -49,10 +50,10 @@ int main(int argc, char **argv) {
class OOMListenerTest : public ::testing::Test {
private:
- char cgroup[PATH_MAX] = {};
- const char* cgroup_root = nullptr;
+ char cgroup[PATH_MAX];
+ const char* cgroup_root;
public:
- OOMListenerTest() = default;
+ OOMListenerTest() : cgroup_root(NULL) {}
virtual ~OOMListenerTest() = default;
virtual const char* GetCGroup() { return cgroup; }
@@ -99,7 +100,7 @@ public:
if (cgroup[0] != '\0') {
rmdir(cgroup);
}
- if (cgroup_root != nullptr &&
+ if (cgroup_root != NULL &&
cgroup_root != cgroup_candidates[0]) {
rmdir(cgroup_root);
}
@@ -184,7 +185,7 @@ TEST_F(OOMListenerTest, test_oom) {
std::cout << "Consuming too much memory" << std::endl;
for (;;) {
auto buffer = (char *) malloc(bufferSize);
- if (buffer != nullptr) {
+ if (buffer != NULL) {
for (int i = 0; i < bufferSize; ++i) {
buffer[i] = (char) std::rand();
}
@@ -213,15 +214,15 @@ TEST_F(OOMListenerTest, test_oom) {
if (listener == 0) {
// child listener forwarding cgroup events
_oom_listener_descriptors descriptors = {
- .command = "test",
- .event_fd = mock_oom_event_as_user,
- .event_control_fd = -1,
- .oom_control_fd = -1,
- .event_control_path = {0},
- .oom_control_path = {0},
- .oom_command = {0},
- .oom_command_len = 0,
- .watch_timeout = 100
+ "test",
+ mock_oom_event_as_user,
+ -1,
+ -1,
+ {0},
+ {0},
+ {0},
+ 0,
+ 100
};
int ret = oom_listener(&descriptors, GetCGroup(), test_pipe[1]);
cleanup(&descriptors);
@@ -256,7 +257,7 @@ TEST_F(OOMListenerTest, test_oom) {
__pid_t exited0 = wait(mem_hog_status);
ASSERT_EQ(mem_hog_pid, exited0)
<< "Wrong process exited";
- ASSERT_EQ(nullptr, mem_hog_status)
+ ASSERT_EQ(NULL, mem_hog_status)
<< "Test process killed with invalid status";
if (mock_oom_event_as_user != -1) {
@@ -275,7 +276,7 @@ TEST_F(OOMListenerTest, test_oom) {
__pid_t exited1 = wait(oom_listener_status);
ASSERT_EQ(listener, exited1)
<< "Wrong process exited";
- ASSERT_EQ(nullptr, oom_listener_status)
+ ASSERT_EQ(NULL, oom_listener_status)
<< "Listener process exited with invalid status";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org