| commit | 1c292d7720c90901800ba246c367062aa43364b8 | [log] [tgz] |
|---|---|---|
| author | Ayaka Koshibe <ayaka@onlab.us> | Wed Oct 08 17:46:07 2014 -0700 |
| committer | Ayaka Koshibe <ayaka@onlab.us> | Wed Oct 08 17:46:07 2014 -0700 |
| tree | c71b886bfa35ebf03a470e785328701110106717 | |
| parent | 1b45855035cd94d747ca2b6e8842f324c66b0e35 [diff] |
minor role relinquishment fix Change-Id: I8fb2d65795b6bba6c0838c5efcf17d6f6528ea65
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java index 92b345c..125745b 100644 --- a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java +++ b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
@@ -99,8 +99,8 @@ @Override public void relinquishMastership(DeviceId deviceId) { MastershipEvent event = null; - event = store.relinquishRole( - clusterService.getLocalNode().id(), deviceId); + event = store.relinquishRole( + clusterService.getLocalNode().id(), deviceId); if (event != null) { post(event);
diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java index a8d63c1..8cde5a3 100644 --- a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java +++ b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
@@ -257,6 +257,8 @@ // temporarily request for Master Role and mark offline. if (!mastershipService.getLocalRole(deviceId).equals(MastershipRole.MASTER)) { log.debug("Device {} disconnected, but I am not the master", deviceId); + //let go of any role anyways + mastershipService.relinquishMastership(deviceId); return; } DeviceEvent event = store.markOffline(deviceId);