commit 4b839c7010c64ffd801a0681492f8042ea2348b1
author Thomas Vachuska <tom@onlab.us> Mon May 18 15:43:03 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon May 18 22:51:45 2015 +0000
tree f44ef48de36b004e1d323b908c6e285996410781
parent 1c681d71f7460bcc6276e44dec79452ad8f60b0f

Fixed an issue where only the new device master node would receive mastership change events.

Change-Id: I08a6530c57c91f006994412b4dfbfb3c16571593

core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
index 5225549..6ff050c 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
@@ -400,25 +400,22 @@
             if (!isDeviceMastershipTopic(leadership.topic())) {
                 return;
             }
-            NodeId nodeId = leadership.leader();
             DeviceId deviceId = extractDeviceIdFromTopic(leadership.topic());
-            if (Objects.equal(nodeId, localNodeId) && connectedDevices.contains(deviceId)) {
-                switch (event.type()) {
-                case LEADER_ELECTED:
-                    notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
-                    break;
-                case LEADER_REELECTED:
-                    // There is no concept of leader re-election in the new distributed leadership manager.
-                    throw new IllegalStateException("Unexpected event type");
-                case LEADER_BOOTED:
-                    notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
-                    break;
-                case CANDIDATES_CHANGED:
-                    notifyDelegate(new MastershipEvent(BACKUPS_CHANGED, deviceId, getNodes(deviceId)));
-                    break;
-                default:
-                    return;
-                }
+            switch (event.type()) {
+            case LEADER_ELECTED:
+                notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
+                break;
+            case LEADER_REELECTED:
+                // There is no concept of leader re-election in the new distributed leadership manager.
+                throw new IllegalStateException("Unexpected event type");
+            case LEADER_BOOTED:
+                notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, getNodes(deviceId)));
+                break;
+            case CANDIDATES_CHANGED:
+                notifyDelegate(new MastershipEvent(BACKUPS_CHANGED, deviceId, getNodes(deviceId)));
+                break;
+            default:
+                return;
             }
         }
     }