You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/01/17 03:00:59 UTC

mesos git commit: Added signal handling to the low level scheduler tests.

Repository: mesos
Updated Branches:
  refs/heads/master 021ccbb85 -> 076889efa


Added signal handling to the low level scheduler tests.

Review: https://reviews.apache.org/r/29996


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/076889ef
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/076889ef
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/076889ef

Branch: refs/heads/master
Commit: 076889efab84f80e094f27601a2f85cb97723528
Parents: 021ccbb
Author: Benjamin Mahler <be...@gmail.com>
Authored: Fri Jan 16 15:27:21 2015 -0800
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Fri Jan 16 18:00:36 2015 -0800

----------------------------------------------------------------------
 src/examples/low_level_scheduler_libprocess.cpp | 6 ++++--
 src/examples/low_level_scheduler_pthread.cpp    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/076889ef/src/examples/low_level_scheduler_libprocess.cpp
----------------------------------------------------------------------
diff --git a/src/examples/low_level_scheduler_libprocess.cpp b/src/examples/low_level_scheduler_libprocess.cpp
index e5267f7..a0ec131 100644
--- a/src/examples/low_level_scheduler_libprocess.cpp
+++ b/src/examples/low_level_scheduler_libprocess.cpp
@@ -46,6 +46,7 @@
 #include "common/type_utils.hpp"
 
 #include "logging/flags.hpp"
+#include "logging/logging.hpp"
 
 using namespace mesos;
 
@@ -386,6 +387,9 @@ int main(int argc, char** argv)
     EXIT(1);
   }
 
+  process::initialize();
+  internal::logging::initialize(argv[0], flags, true); // Catch signals.
+
   FrameworkInfo framework;
   framework.set_user(""); // Have Mesos fill in the current user.
   framework.set_name("Low-Level Scheduler using libprocess (C++)");
@@ -402,8 +406,6 @@ int main(int argc, char** argv)
   executor.set_name("Test Executor (C++)");
   executor.set_source("cpp_test");
 
-  process::initialize();
-
   LowLevelScheduler* scheduler;
   if (os::hasenv("MESOS_AUTHENTICATE")) {
     cout << "Enabling authentication for the scheduler" << endl;

http://git-wip-us.apache.org/repos/asf/mesos/blob/076889ef/src/examples/low_level_scheduler_pthread.cpp
----------------------------------------------------------------------
diff --git a/src/examples/low_level_scheduler_pthread.cpp b/src/examples/low_level_scheduler_pthread.cpp
index 4f9a594..f05489a 100644
--- a/src/examples/low_level_scheduler_pthread.cpp
+++ b/src/examples/low_level_scheduler_pthread.cpp
@@ -45,6 +45,7 @@
 #include "common/type_utils.hpp"
 
 #include "logging/flags.hpp"
+#include "logging/logging.hpp"
 
 using namespace mesos;
 
@@ -446,6 +447,8 @@ int main(int argc, char** argv)
     EXIT(1);
   }
 
+  internal::logging::initialize(argv[0], flags, true); // Catch signals.
+
   FrameworkInfo framework;
   framework.set_user(""); // Have Mesos fill in the current user.
   framework.set_name("Low-Level Scheduler using pthread (C++)");