You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/04/23 04:11:52 UTC

mesos git commit: Minor fix to scheduler.cpp to ignore REGISTERED and REREGISTERED events when disconnected.

Repository: mesos
Updated Branches:
  refs/heads/master c36d59963 -> 8ff3fd05d


Minor fix to scheduler.cpp to ignore REGISTERED and REREGISTERED
events when disconnected.


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

Branch: refs/heads/master
Commit: 8ff3fd05da01c38b86e1984bc12c1c27842a6793
Parents: c36d599
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Apr 22 19:10:55 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Apr 22 19:11:39 2015 -0700

----------------------------------------------------------------------
 src/scheduler/scheduler.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8ff3fd05/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index 584b042..bd9fced 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -568,13 +568,9 @@ protected:
   {
     // Check if we're disconnected but received an event.
     if (from.isSome() && master.isNone()) {
-      // Ignore the event unless it's a registered or reregistered.
-      if (event.type() != Event::REGISTERED &&
-          event.type() != Event::REREGISTERED) {
-        VLOG(1) << "Ignoring " << stringify(event.type())
-                << " event because we're disconnected";
-        return;
-      }
+      VLOG(1) << "Ignoring " << stringify(event.type())
+              << " event because we're disconnected";
+      return;
     } else if (from.isSome() && master != from) {
       VLOG(1)
         << "Ignoring " << stringify(event.type())