홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
b6eb9144 1 parent 26df2f2d

DistributedFlowRuleStore: handle no master present case 

Change-Id: I56f4bce549aecc689d7a4798485b025a87ecdeb9
Inline Side-by-side
Showing 1 changed file with 9 additions and 2 deletions
......@@ -519,7 +519,8 @@ public class DistributedFlowRuleStore
@Override
public FlowRuleEvent removeFlowRule(FlowEntry rule) {
ReplicaInfo replicaInfo = replicaInfoManager.getReplicaInfoFor(rule.deviceId());
final DeviceId deviceId = rule.deviceId();
ReplicaInfo replicaInfo = replicaInfoManager.getReplicaInfoFor(deviceId);
final NodeId localId = clusterService.getLocalNode().id();
if (localId.equals(replicaInfo.master().orNull())) {
......@@ -527,8 +528,14 @@ public class DistributedFlowRuleStore
return removeFlowRuleInternal(rule);
}
if (!replicaInfo.master().isPresent()) {
log.warn("No master for {}", deviceId);
// TODO: revisit if this should be null (="no-op") or Exception
return null;
}
log.trace("Forwarding removeFlowRule to {}, which is the primary (master) for device {}",
replicaInfo.master().orNull(), rule.deviceId());
replicaInfo.master().orNull(), deviceId);
ClusterMessage message = new ClusterMessage(
clusterService.getLocalNode().id(),
......