Repository: mesos Updated Branches: refs/heads/master d04b07ad5 -> 4c4233717
Updated the documentatin of SchedulerDriver::stop(). Review: https://reviews.apache.org/r/23143 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4c423371 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4c423371 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4c423371 Branch: refs/heads/master Commit: 4c4233717ed1c1788eac7cc242bb0cfe0f829c4c Parents: d04b07a Author: Vinod Kone <[email protected]> Authored: Fri Jun 27 15:47:03 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Fri Jun 27 15:47:10 2014 -0700 ---------------------------------------------------------------------- include/mesos/scheduler.hpp | 11 ++++++----- src/java/src/org/apache/mesos/SchedulerDriver.java | 16 ++++++++++------ src/python/src/mesos.py | 15 ++++++++------- 3 files changed, 24 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4c423371/include/mesos/scheduler.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/scheduler.hpp b/include/mesos/scheduler.hpp index e6c9c78..8027272 100644 --- a/include/mesos/scheduler.hpp +++ b/include/mesos/scheduler.hpp @@ -211,11 +211,12 @@ public: /** * Stops the scheduler driver. If the 'failover' flag is set to * false then it is expected that this framework will never - * reconnect to Mesos and all of its executors and tasks can be - * terminated. Otherwise, all executors and tasks will remain - * running (for some framework specific failover timeout) allowing the - * scheduler to reconnect (possibly in the same process, or from a - * different process, for example, on a different machine). + * reconnect to Mesos. So Mesos will unregister the framework + * and shutdown all its tasks and executors. If 'failover' is true, + * all executors and tasks will remain running (for some framework + * specific failover timeout) allowing the scheduler to reconnect + * (possibly in the same process, or from a different process, for + * example, on a different machine). */ virtual Status stop(bool failover = false) = 0; http://git-wip-us.apache.org/repos/asf/mesos/blob/4c423371/src/java/src/org/apache/mesos/SchedulerDriver.java ---------------------------------------------------------------------- diff --git a/src/java/src/org/apache/mesos/SchedulerDriver.java b/src/java/src/org/apache/mesos/SchedulerDriver.java index bd61a13..f12a2a0 100644 --- a/src/java/src/org/apache/mesos/SchedulerDriver.java +++ b/src/java/src/org/apache/mesos/SchedulerDriver.java @@ -42,11 +42,12 @@ public interface SchedulerDriver { /** * Stops the scheduler driver. If the 'failover' flag is set to * false then it is expected that this framework will never - * reconnect to Mesos and all of it's executors and tasks can be - * terminated. Otherwise, all executors and tasks will remain - * running (for some master specified failover timeout) allowing the - * scheduler to reconnect (possibly in the same process, or from a - * different process, for example, on a different machine). + * reconnect to Mesos. So Mesos will unregister the framework + * and shutdown all its tasks and executors. If 'failover' is true, + * all executors and tasks will remain running (for some framework + * specific failover timeout) allowing the scheduler to reconnect + * (possibly in the same process, or from a different process, for + * example, on a different machine). * * @param failover Whether framework failover is expected. * @return The state of the driver after the call. @@ -54,7 +55,10 @@ public interface SchedulerDriver { Status stop(boolean failover); /** - * Stops the scheduler driver assuming no failover. + * Stops the scheduler driver assuming no failover. This will + * cause Mesos to unregister the framework and shutdown all + * its tasks and executors. Please see {@link #stop(failover)} + * for more details. * * @return The state of the driver after the call. */ http://git-wip-us.apache.org/repos/asf/mesos/blob/4c423371/src/python/src/mesos.py ---------------------------------------------------------------------- diff --git a/src/python/src/mesos.py b/src/python/src/mesos.py index a9764fb..0152ab4 100644 --- a/src/python/src/mesos.py +++ b/src/python/src/mesos.py @@ -152,13 +152,14 @@ class SchedulerDriver(object): def stop(self, failover=False): """ - Stops the scheduler driver. If the 'failover' flag is set to False - then it is expected that this framework will never reconnect to Mesos - and all of its executors and tasks can be terminated. Otherwise, all - executors and tasks will remain running (for some framework specific - failover timeout) allowing the scheduler to reconnect (possibly in the - same process, or from a different process, for example, on a different - machine.) + Stops the scheduler driver. If the 'failover' flag is set to + false then it is expected that this framework will never + reconnect to Mesos. So Mesos will unregister the framework + and shutdown all its tasks and executors. If 'failover' is true, + all executors and tasks will remain running (for some framework + specific failover timeout) allowing the scheduler to reconnect + (possibly in the same process, or from a different process, for + example, on a different machine). """ def abort(self):
