mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-21 20:31:00 +02:00
Code Issues Projects Releases Wiki Activity

MastershipService.relinquishRole returns CompletableFuture + Block deviceDiconnected until role relinquish is complete

Browse Source 
Change-Id: I081df48fc05fdca2e452a937a093d5caa16091ed
This commit is contained in:
Madan Jampani 2015-05-29 13:41:52 -07:00 committed by Gerrit Code Review
parent 4859be0403
commit c6e574f90e
7 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/src/main/java/org/onosproject/mastership/MastershipService.java
View File

@ -55,8 +55,9 @@ public interface MastershipService {
* for this device, no master selection will occur.
*
* @param deviceId the identifier of the device
* @return future that is completed when relinquish is complete
*/
void relinquishMastership(DeviceId deviceId);
CompletableFuture<Void> relinquishMastership(DeviceId deviceId);
/**
* Returns the current master for a given device.

3
core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
View File

@ -38,7 +38,8 @@ public class MastershipServiceAdapter implements MastershipService {
}
@Override
public void relinquishMastership(DeviceId deviceId) {
public CompletableFuture<Void> relinquishMastership(DeviceId deviceId) {
return null;
}
@Override

22
core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
View File

@ -95,12 +95,13 @@ public class MastershipManager
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected MetricsService metricsService;
private NodeId localNodeId;
private Timer requestRoleTimer;
@Activate
public void activate() {
requestRoleTimer = createTimer("Mastership", "requestRole", "responseTime");
localNodeId = clusterService.getLocalNode().id();
eventDispatcher.addSink(MastershipEvent.class, listenerRegistry);
store.setDelegate(delegate);
log.info("Started");
@ -136,11 +137,8 @@ public class MastershipManager
return CompletableFuture.completedFuture(null);
}
return eventFuture.whenComplete((event, error) -> {
if (event != null) {
post(event);
}
}).thenApply(v -> null);
return eventFuture.thenAccept(this::post)
.thenApply(v -> null);
}
@Override
@ -152,15 +150,11 @@ public class MastershipManager
}
@Override
public void relinquishMastership(DeviceId deviceId) {
public CompletableFuture<Void> relinquishMastership(DeviceId deviceId) {
checkPermission(Permission.CLUSTER_WRITE);
store.relinquishRole(clusterService.getLocalNode().id(), deviceId)
.whenComplete((event, error) -> {
if (event != null) {
post(event);
}
});
return store.relinquishRole(localNodeId, deviceId)
.thenAccept(this::post)
.thenApply(v -> null);
}
@Override

12
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View File

@ -16,7 +16,6 @@
package org.onosproject.net.device.impl;
import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@ -411,8 +410,15 @@ public class DeviceManager
}
});
} finally {
//relinquish master role and ability to be backup.
mastershipService.relinquishMastership(deviceId);
try {
//relinquish master role and ability to be backup.
mastershipService.relinquishMastership(deviceId).get();
} catch (InterruptedException e) {
log.warn("Interrupted while reliquishing role for {}", deviceId);
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
log.error("Exception thrown while relinquishing role for {}", deviceId, e);
}
}
}

5
core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
View File

@ -310,6 +310,11 @@ public class DeviceManagerTest {
return CompletableFuture.completedFuture(MastershipRole.MASTER);
}
@Override
public CompletableFuture<Void> relinquishMastership(DeviceId deviceId) {
return CompletableFuture.completedFuture(null);
}
@Override
public MastershipTerm getMastershipTerm(DeviceId deviceId) {
// FIXME: just returning something not null

6
core/store/dist/src/test/java/org/onosproject/store/device/impl/GossipDeviceStoreTest.java vendored
View File

@ -37,6 +37,7 @@ import org.onosproject.net.Annotations;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.Port;
import org.onosproject.net.PortNumber;
import org.onosproject.net.SparseAnnotations;
@ -62,6 +63,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@ -854,6 +856,10 @@ public class GossipDeviceStoreTest {
public NodeId getMasterFor(DeviceId deviceId) {
return NID1;
}
@Override
public CompletableFuture<MastershipRole> requestRoleFor(DeviceId deviceId) {
return CompletableFuture.completedFuture(null);
}
}
private static final class TestGossipDeviceStore extends GossipDeviceStore {

4
providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
View File

@ -502,8 +502,8 @@ public class LLDPLinkProviderTest {
}
@Override
public void relinquishMastership(DeviceId deviceId) {
public CompletableFuture<Void> relinquishMastership(DeviceId deviceId) {
return null;
}
@Override