Repository: mesos Updated Branches: refs/heads/master c397fe2a3 -> 5c8fc82e5
Minor cleanups to the slave. Review: https://reviews.apache.org/r/35410 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/69045048 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/69045048 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/69045048 Branch: refs/heads/master Commit: 6904504890214cd047eb088b62de6ebd6b40204b Parents: c397fe2 Author: Benjamin Mahler <[email protected]> Authored: Fri Jun 12 16:44:29 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Mon Jun 15 14:27:02 2015 -0700 ---------------------------------------------------------------------- src/slave/slave.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/69045048/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index 67732a4..a4b1e3d 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -840,9 +840,10 @@ void Slave::registered(const UPID& from, const SlaveID& slaveId) return; } + CHECK_SOME(master); + switch(state) { case DISCONNECTED: { - CHECK_SOME(master); LOG(INFO) << "Registered with master " << master.get() << "; given slave ID " << slaveId; @@ -888,7 +889,6 @@ void Slave::registered(const UPID& from, const SlaveID& slaveId) EXIT(1) << "Registered but got wrong id: " << slaveId << "(expected: " << info.id() << "). Committing suicide"; } - CHECK_SOME(master); LOG(WARNING) << "Already registered with master " << master.get(); break; case TERMINATING: @@ -914,16 +914,20 @@ void Slave::reregistered( return; } + CHECK_SOME(master); + + if (!(info.id() == slaveId)) { + EXIT(1) << "Re-registered but got wrong id: " << slaveId + << "(expected: " << info.id() << "). Committing suicide"; + } + switch(state) { case DISCONNECTED: - CHECK_SOME(master); LOG(INFO) << "Re-registered with master " << master.get(); state = RUNNING; - statusUpdateManager->resume(); // Resume status updates. break; case RUNNING: - CHECK_SOME(master); LOG(WARNING) << "Already re-registered with master " << master.get(); break; case TERMINATING: @@ -941,11 +945,6 @@ void Slave::reregistered( return; } - if (!(info.id() == slaveId)) { - EXIT(1) << "Re-registered but got wrong id: " << slaveId - << "(expected: " << info.id() << "). Committing suicide"; - } - // Reconcile any tasks per the master's request. foreach (const ReconcileTasksMessage& reconcile, reconciliations) { Framework* framework = getFramework(reconcile.framework_id());
