commit 86741ece0495abaff55e34823370b91886df55d1
author Jordan Halterman <jordan@opennetworking.org> Mon Dec 10 11:02:31 2018 -0800
committer Jordan Halterman <jordan@opennetworking.org> Wed Dec 12 00:16:07 2018 +0000
tree 8c6f47d447c79f667b87ed8ff421555316e96a99
parent d06a8511cdf170db8552b499c59c18fbebe2c10f

Ensure master is excluded from backups list when reading role info from mastership service

Change-Id: Iaa100b8b40614f2f83a05ea32a43f0efde6aad4a

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 3990a8b..3c6e1c2 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
@@ -185,8 +185,8 @@
     @Override
     public RoleInfo getNodes(DeviceId deviceId) {
         checkArgument(deviceId != null, DEVICE_ID_NULL);
-        Leadership leadership = leadershipService.getLeadership(createDeviceMastershipTopic(deviceId));
-        return new RoleInfo(leadership.leaderNodeId(), leadership.candidates());
+        MastershipInfo mastership = getMastership(deviceId);
+        return new RoleInfo(mastership.master().orElse(null), mastership.backups());
     }
 
     @Override