홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
c7104671 1 parent 3c4124a9

Fix for Mastership exception fetching timestamp - from Madan 

Change-Id: Ifec4fe8a559a7d5832afc8eb62c936b28fffc186
Inline Side-by-side
Showing 1 changed file with 7 additions and 5 deletions
......@@ -312,13 +312,15 @@ public class DeviceManager
log.debug("Checking mastership");
for (Device device : getDevices()) {
final DeviceId deviceId = device.id();
log.trace("Checking device {}", deviceId);
MastershipRole myRole = mastershipService.getLocalRole(deviceId);
log.trace("Checking device {}. Current role is {}", deviceId, myRole);
if (!isReachable(deviceId)) {
if (mastershipService.getLocalRole(deviceId) != NONE) {
if (myRole != NONE) {
// can't be master if device is not reachable
try {
post(store.markOffline(deviceId));
if (myRole == MASTER) {
post(store.markOffline(deviceId));
}
//relinquish master role and ability to be backup.
mastershipService.relinquishMastership(deviceId).get();
} catch (InterruptedException e) {
......@@ -331,7 +333,7 @@ public class DeviceManager
continue;
}
if (mastershipService.getLocalRole(deviceId) != NONE) {
if (myRole != NONE) {
continue;
}
......