Repository: mesos Updated Branches: refs/heads/master a7d2cc369 -> 8e0d6549d
Removed unused failover functionality in scheduler library. We now leave it upto the client to set the force option when making the subscribe call. This existed in the pre-Call era as force(failover) was not exposed to the scheduler. Review: https://reviews.apache.org/r/37108 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cb5c635d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cb5c635d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cb5c635d Branch: refs/heads/master Commit: cb5c635df4025ed6ddbbef1ef98e42c495852123 Parents: a7d2cc3 Author: Anand Mazumdar <[email protected]> Authored: Thu Aug 6 09:24:44 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Thu Aug 6 09:24:44 2015 -0700 ---------------------------------------------------------------------- src/scheduler/scheduler.cpp | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cb5c635d/src/scheduler/scheduler.cpp ---------------------------------------------------------------------- diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp index 97fa2c0..4c0c80b 100644 --- a/src/scheduler/scheduler.cpp +++ b/src/scheduler/scheduler.cpp @@ -106,7 +106,6 @@ public: disconnected(_disconnected), received(_received), local(false), - failover(true), detector(NULL), authenticatee(NULL), authenticating(None()), @@ -444,15 +443,11 @@ protected: void receive(const UPID& from, const FrameworkRegisteredMessage& message) { - failover = false; - receive(from, protobuf::scheduler::event(message)); } void receive(const UPID& from, const FrameworkReregisteredMessage& message) { - failover = false; - receive(from, protobuf::scheduler::event(message)); } @@ -521,12 +516,6 @@ private: bool local; // Whether or not we launched a local cluster. - // Whether or not this is the first time we've sent a - // REREGISTER. This is to maintain compatibility with what the - // master expects from SchedulerProcess. After the first REGISTER or - // REREGISTER event we force this to be false. - bool failover; - MasterDetector* detector; queue<Event> events;
