Bug fixes for ONOS-3509
- Forwarding behavior added to {Device,Link}Store by ONOS-490
cauesed false update information sent from ONOS node, which has been detached from the cluster,
to be accepted by rest of the cluster after the detached node has rejoined cluster.
- Fix for periodic mastership check was left out
when MastershipService#requestRoleFor(..) return value was changed to Future.
- Fix for triggerProbe() related messages getting dropped,
right after STANDBY -> MASTER role change.
- Local state (connectedDevices) was preventing
vertical (Core -> switch) Mastership state synchronization.
- Various debug log, comment added during investigation.
Change-Id: I777beadf04db8a879830a07bfdc7ab0e2279f190
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index f9a6059..5bca54e 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -73,12 +73,12 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-
import static org.onlab.util.Tools.groupedThreads;
@Component(immediate = true)
@@ -118,11 +118,11 @@
private final ExecutorService executorBarrier =
Executors.newFixedThreadPool(4, groupedThreads("onos/of", "event-barrier-%d"));
- protected ConcurrentHashMap<Dpid, OpenFlowSwitch> connectedSwitches =
+ protected ConcurrentMap<Dpid, OpenFlowSwitch> connectedSwitches =
new ConcurrentHashMap<>();
- protected ConcurrentHashMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
+ protected ConcurrentMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
new ConcurrentHashMap<>();
- protected ConcurrentHashMap<Dpid, OpenFlowSwitch> activeEqualSwitches =
+ protected ConcurrentMap<Dpid, OpenFlowSwitch> activeEqualSwitches =
new ConcurrentHashMap<>();
protected OpenFlowSwitchAgent agent = new OpenFlowSwitchAgent();
@@ -280,6 +280,7 @@
executorMsgs.submit(new OFMessageHandler(dpid, msg));
break;
case ERROR:
+ log.debug("Received error message from {}: {}", dpid, msg);
executorMsgs.submit(new OFMessageHandler(dpid, msg));
break;
case STATS_REPLY: