Repository: mesos Updated Branches: refs/heads/master 90b107a24 -> 65efb3473
Fixed a bug where the framework failover registration message is dropped. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/65efb347 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/65efb347 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/65efb347 Branch: refs/heads/master Commit: 65efb347301f90e638361a50282cb74980c4c081 Parents: 90b107a Author: Benjamin Mahler <[email protected]> Authored: Tue Jul 28 14:00:22 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Tue Jul 28 14:00:22 2015 -0700 ---------------------------------------------------------------------- src/master/master.cpp | 3 +-- src/master/master.hpp | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/65efb347/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 3e63184..c584cb9 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -4817,6 +4817,7 @@ void Master::failoverFramework(Framework* framework, const UPID& newPid) framework->pid = newPid; link(newPid); + framework->connected = true; // The scheduler driver safely ignores any duplicate registration // messages, so we don't need to compare the old and new pids here. @@ -4835,8 +4836,6 @@ void Master::failoverFramework(Framework* framework, const UPID& newPid) removeOffer(offer); } - framework->connected = true; - // Reactivate the framework. // NOTE: We do this after recovering resources (above) so that // the allocator has the correct view of the framework's share. http://git-wip-us.apache.org/repos/asf/mesos/blob/65efb347/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index 879e3d8..2331173 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -1329,7 +1329,6 @@ struct Framework if (!connected) { LOG(WARNING) << "Master attempted to send message to disconnected" << " framework " << *this; - return; } if (http.isSome()) {
