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 2016/02/21 14:25:45 UTC
[1/2] mesos git commit: Documented the ShutdownProcess in the
executor library.
Repository: mesos
Updated Branches:
refs/heads/master de1434978 -> 152ac2b13
Documented the ShutdownProcess in the executor library.
Review: https://reviews.apache.org/r/43762/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/34b3ea9e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/34b3ea9e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/34b3ea9e
Branch: refs/heads/master
Commit: 34b3ea9e421d6bc500ef7b7ce8c24b6a73c78dcd
Parents: de14349
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Sun Feb 21 14:02:16 2016 +0100
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Sun Feb 21 14:21:42 2016 +0100
----------------------------------------------------------------------
src/exec/exec.cpp | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/34b3ea9e/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index ffa9396..7560296 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -72,6 +72,13 @@ using process::wait; // Necessary on some OS's to disambiguate.
namespace mesos {
namespace internal {
+// The ShutdownProcess is a relic of the pre-cgroup process isolation
+// days. It ensures that the executor process tree is killed after a
+// shutdown has been sent.
+//
+// TODO(bmahler): Update 'delay' to handle deferred callbacks without
+// needing a Process. This would eliminate the need for an explicit
+// Process here, see: MESOS-4729.
class ShutdownProcess : public Process<ShutdownProcess>
{
protected:
[2/2] mesos git commit: Log the shutdown duration in the executor
driver.
Posted by bm...@apache.org.
Log the shutdown duration in the executor driver.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/152ac2b1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/152ac2b1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/152ac2b1
Branch: refs/heads/master
Commit: 152ac2b13916bcf2bb9e52accc4951c3ce5bfd76
Parents: 34b3ea9
Author: Benjamin Mahler <bm...@apache.org>
Authored: Sun Feb 21 14:22:07 2016 +0100
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Sun Feb 21 14:22:07 2016 +0100
----------------------------------------------------------------------
src/exec/exec.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/152ac2b1/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index 7560296..dec7e88 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -84,7 +84,9 @@ class ShutdownProcess : public Process<ShutdownProcess>
protected:
virtual void initialize()
{
- VLOG(1) << "Scheduling shutdown of the executor";
+ VLOG(1) << "Scheduling shutdown of the executor in "
+ << slave::EXECUTOR_SHUTDOWN_GRACE_PERIOD;
+
// TODO(benh): Pass the shutdown timeout with ExecutorRegistered
// since it might have gotten configured on the command line.
delay(slave::EXECUTOR_SHUTDOWN_GRACE_PERIOD, self(), &Self::kill);