Change return type of events

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / lifecycle / ContextChainHolderImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainHolderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainHolderImpl.java
index 25ce05e866063951063f41806c5a0fb65151e5b3..f521e971527b72d14c1bb6ea11a5cb09cd84a5f9 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainHolderImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainHolderImpl.java
@@ -9,6 +9,8 @@ package org.opendaylight.openflowplugin.impl.lifecycle;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import io.netty.util.HashedWheelTimer;
 import java.util.Collections;
 import java.util.HashMap;
@@ -64,7 +66,6 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
 
     private final Map<DeviceInfo, ContextChain> contextChainMap = Collections.synchronizedMap(new HashMap<>());
     private final EntityOwnershipListenerRegistration eosListenerRegistration;
-    private final HashedWheelTimer timer;
     private final ClusterSingletonServiceProvider singletonServiceProvider;
     private final ItemScheduler<DeviceInfo, ContextChain> scheduler;
     private final ExecutorService executorService;
@@ -78,7 +79,6 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
                                   final ClusterSingletonServiceProvider singletonServiceProvider,
                                   final EntityOwnershipService entityOwnershipService,
                                   final OwnershipChangeListener ownershipChangeListener) {
-        this.timer = timer;
         this.singletonServiceProvider = singletonServiceProvider;
         this.executorService = executorService;
         this.ownershipChangeListener = ownershipChangeListener;
@@ -108,7 +108,7 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
     }
 
     @VisibleForTesting
-    ContextChain createContextChain(final ConnectionContext connectionContext) {
+    void createContextChain(final ConnectionContext connectionContext) {
         final DeviceInfo deviceInfo = connectionContext.getDeviceInfo();
 
         final DeviceContext deviceContext = deviceManager.createContext(connectionContext);
@@ -143,7 +143,6 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
                 CHECK_ROLE_MASTER_TIMEOUT / 1000L);
 
         contextChain.registerServices(singletonServiceProvider);
-        return contextChain;
     }
 
     @Override
@@ -169,8 +168,7 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
         }
 
         LOG.debug("No context chain found for device: {}, creating new.", deviceInfo);
-        final ContextChain newContextChain = createContextChain(connectionContext);
-        LOG.debug("Successfully created context chain with identifier: {}", newContextChain.getIdentifier());
+        createContextChain(connectionContext);
         return ConnectionStatus.MAY_CONTINUE;
     }
 
@@ -201,9 +199,10 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
                 } else {
                     contextChain.isMastered(mastershipState);
                     if (contextChain.isPrepared()) {
-                        ownershipChangeListener.becomeMasterBeforeSubmittedDS(
-                                deviceInfo,
-                                reconciliationFrameworkCallback(deviceInfo, contextChain));
+                        Futures.addCallback(
+                                ownershipChangeListener.becomeMasterBeforeSubmittedDS(deviceInfo),
+                                reconciliationFrameworkCallback(deviceInfo, contextChain),
+                                MoreExecutors.directExecutor());
                     }
                 }
             } else if (contextChain.isMastered(mastershipState)) {
@@ -248,7 +247,9 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
     @Override
     public void close() throws Exception {
         scheduler.close();
-        contextChainMap.keySet().forEach(this::destroyContextChain);
+        Map<DeviceInfo, ContextChain> copyOfChains = new HashMap<>(contextChainMap);
+        copyOfChains.keySet().forEach(this::destroyContextChain);
+        copyOfChains.clear();
         contextChainMap.clear();
         eosListenerRegistration.close();
     }
@@ -275,7 +276,7 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
                 deviceManager
                         .removeDeviceFromOperationalDS(nodeInstanceIdentifier)
                         .checkedGet(REMOVE_DEVICE_FROM_DS_TIMEOUT, TimeUnit.MILLISECONDS);
-            } catch (TimeoutException | TransactionCommitFailedException e) {
+            } catch (TimeoutException | TransactionCommitFailedException | NullPointerException e) {
                 LOG.info("Not able to remove device {} from operational DS. Probably removed by another cluster node.",
                         nodeId);
             }
@@ -284,7 +285,6 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
 
     private synchronized void destroyContextChain(final DeviceInfo deviceInfo) {
         scheduler.remove(deviceInfo);
-        ownershipChangeListener.becomeSlaveOrDisconnect(deviceInfo);
 
         Optional.ofNullable(contextChainMap.get(deviceInfo)).ifPresent(contextChain -> {
             deviceManager.sendNodeRemovedNotification(deviceInfo.getNodeInstanceIdentifier());
@@ -346,12 +346,14 @@ public class ContextChainHolderImpl implements ContextChainHolder, MasterChecker
                 if (ResultState.DONOTHING == result) {
                     LOG.info("Device {} connection is enabled by reconciliation framework.", deviceInfo);
                     if (!contextChain.continueInitializationAfterReconciliation()) {
+                        LOG.warn("Initialization submit after reconciliation failed for device {}", deviceInfo);
                         destroyContextChain(deviceInfo);
                     } else {
                         ownershipChangeListener.becomeMaster(deviceInfo);
+                        deviceManager.sendNodeAddedNotification(deviceInfo.getNodeInstanceIdentifier());
                     }
                 } else {
-                    LOG.warn("Reconciliation framework failure.");
+                    LOG.warn("Reconciliation framework failure for device {}", deviceInfo);
                     destroyContextChain(deviceInfo);
                 }
             }