mesos git commit: Fixed a no-longer-correct comment in `Master::shutdownSlave`.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master a1423a5fe -> ee7567448


Fixed a no-longer-correct comment in `Master::shutdownSlave`.

The comment was correct when written, but is no longer accurate.

Review: https://reviews.apache.org/r/49623/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ee756744
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ee756744
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ee756744

Branch: refs/heads/master
Commit: ee75674486cfaa12f32f99a8be41e03607a46b32
Parents: a1423a5
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Jul 5 18:59:05 2016 -0500
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jul 5 18:59:05 2016 -0500

----------------------------------------------------------------------
 src/master/master.cpp | 5 +++--
 src/master/master.hpp | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/ee756744/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 007f78e..79e3d78 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5428,8 +5428,9 @@ void Master::shutdown(
 void Master::shutdownSlave(const SlaveID& slaveId, const string& message)
 {
   if (!slaves.registered.contains(slaveId)) {
-    // Possible when the SlaveObserver dispatched to shutdown a slave,
-    // but exited() was already called for this slave.
+    // Possible when the SlaveObserver dispatches a message to
+    // shutdown a slave but the slave is concurrently removed for
+    // another reason (e.g., `UnregisterSlaveMessage` is received).
     LOG(WARNING) << "Unable to shutdown unknown agent " << slaveId;
     return;
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/ee756744/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 996ff42..fbacd92 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -1559,8 +1559,8 @@ private:
     Option<process::Timer> recoveredTimer;
 
     // Slaves that have been recovered from the registrar but have yet
-    // to re-register. We keep a "reregistrationTimer" above to ensure
-    // we remove these slaves if they do not re-register.
+    // to re-register. We use `recoveredTimer` above to ensure we
+    // remove these slaves if they do not re-register.
     hashset<SlaveID> recovered;
 
     // Slaves that are in the process of registering.