Repository: mesos Updated Branches: refs/heads/master ca50df15a -> 719be2502
Fixed MESOS-1058: check failure in the master. Review: https://reviews.apache.org/r/18828 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4a70f14b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4a70f14b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4a70f14b Branch: refs/heads/master Commit: 4a70f14b2cef5710daf46b0e35e7b8f750a4f2f0 Parents: ca50df1 Author: Benjamin Mahler <[email protected]> Authored: Wed Mar 5 18:11:23 2014 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Thu Mar 6 10:02:34 2014 -0800 ---------------------------------------------------------------------- src/master/master.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4a70f14b/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index f328bd9..3c7f59a 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -3024,9 +3024,7 @@ void Master::removeSlave(Slave* slave) // We do this first, to make sure any of the resources recovered // below (e.g., removeTask()) are ignored by the allocator. - if (!slave->disconnected) { - allocator->slaveRemoved(slave->id); - } + allocator->slaveRemoved(slave->id); // Remove pointers to slave's tasks in frameworks, and send status // updates.
