[7/9] mesos git commit: Don't send PIDs of disconnected frameworks to re-registering agents.

[vi...@apache.org]

Don't send PIDs of disconnected frameworks to re-registering agents.

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


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

Branch: refs/heads/master
Commit: 310864a45932b40e9c682f0ef2ce5dac70f5ef42
Parents: c0504ff
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Dec 7 17:04:46 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Dec 7 17:05:49 2016 -0800

----------------------------------------------------------------------
 src/master/master.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/310864a4/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index b496783..588b8cc 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5534,9 +5534,9 @@ void Master::__reregisterSlave(
   foreach (const FrameworkID& frameworkId, ids) {
     Framework* framework = getFramework(frameworkId);
 
-    // TODO(neilc): It doesn't seem useful to send the PIDs of
-    // frameworks that are not connected.
-    if (framework != nullptr) {
+    // We don't need to send the PIDs of disconnected frameworks to
+    // re-registering slaves.
+    if (framework != nullptr && framework->connected()) {
       UpdateFrameworkMessage message;
       message.mutable_framework_id()->MergeFrom(framework->id());