BUG-956 deadlock by rpc invocation - phase2

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / session / SessionManagerOFImpl.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java
index f1bd382005bb536e6a5efb61591c8ecb9298959d..afda07fc38961ec1c24156b9a0082811d47cfd36 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.session;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -20,6 +21,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor;
 import org.opendaylight.openflowplugin.openflow.md.core.IMDMessageTranslator;
 import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
 import org.opendaylight.openflowplugin.openflow.md.core.TranslatorKey;
+import org.opendaylight.openflowplugin.openflow.md.queue.PopListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.util.ListenerRegistry;
@@ -27,6 +29,8 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.util.concurrent.ListeningExecutorService;
+
 /**
  * @author mirehak
  */
@@ -34,13 +38,16 @@ public class SessionManagerOFImpl implements SessionManager {
 
     protected static final Logger LOG = LoggerFactory.getLogger(SessionManagerOFImpl.class);
     private static SessionManagerOFImpl instance;
-    private ConcurrentHashMap<SwitchConnectionDistinguisher, SessionContext> sessionLot;
-    private Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, DataObject>>> translatorMapping;
+    private ConcurrentHashMap<SwitchSessionKeyOF, SessionContext> sessionLot;
+    private Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, List<DataObject>>>> translatorMapping;
+    private Map<Class<? extends DataObject>, Collection<PopListener<DataObject>>> popListenerMapping;
 
-    protected final ListenerRegistry<SessionListener> sessionListeners = new ListenerRegistry<>();
+    protected ListenerRegistry<SessionListener> sessionListeners;
     private NotificationProviderService notificationProviderService;
 
     private DataProviderService dataProviderService;
+    private ListeningExecutorService rpcPool;
+    
 
     /**
      * @return singleton instance
@@ -51,18 +58,28 @@ public class SessionManagerOFImpl implements SessionManager {
         }
         return instance;
     }
+    
+    /**
+     * close and release singleton instace
+     */
+    public static synchronized void releaseInstance() {
+        instance.close();
+        instance = null;
+    }
 
     private SessionManagerOFImpl() {
+        LOG.debug("singleton creating");
         sessionLot = new ConcurrentHashMap<>();
+        sessionListeners = new ListenerRegistry<>();
     }
 
     @Override
-    public SessionContext getSessionContext(SwitchConnectionDistinguisher sessionKey) {
+    public SessionContext getSessionContext(SwitchSessionKeyOF sessionKey) {
         return sessionLot.get(sessionKey);
     }
 
     @Override
-    public void invalidateSessionContext(SwitchConnectionDistinguisher sessionKey) {
+    public void invalidateSessionContext(SwitchSessionKeyOF sessionKey) {
         SessionContext context = getSessionContext(sessionKey);
         if (context == null) {
             LOG.warn("context for invalidation not found");
@@ -100,7 +117,7 @@ public class SessionManagerOFImpl implements SessionManager {
     }
 
     @Override
-    public void addSessionContext(SwitchConnectionDistinguisher sessionKey, SessionContext context) {
+    public void addSessionContext(SwitchSessionKeyOF sessionKey, SessionContext context) {
         sessionLot.put(sessionKey, context);
 
         sessionNotifier.onSessionAdded(sessionKey, context);
@@ -108,7 +125,7 @@ public class SessionManagerOFImpl implements SessionManager {
     }
 
     @Override
-    public void invalidateAuxiliary(SwitchConnectionDistinguisher sessionKey,
+    public void invalidateAuxiliary(SwitchSessionKeyOF sessionKey,
             SwitchConnectionDistinguisher connectionCookie) {
         SessionContext context = getSessionContext(sessionKey);
         invalidateAuxiliary(context, connectionCookie, true);
@@ -147,19 +164,20 @@ public class SessionManagerOFImpl implements SessionManager {
     }
 
     @Override
-    public void setTranslatorMapping(Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, DataObject>>> translatorMapping) {
+    public void setTranslatorMapping(Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, List<DataObject>>>> translatorMapping) {
         this.translatorMapping = translatorMapping;
     }
 
     @Override
     public ListenerRegistration<SessionListener> registerSessionListener(SessionListener listener) {
+        LOG.debug("registerSessionListener");
         return sessionListeners.register(listener);
     }
 
     private final SessionListener sessionNotifier = new SessionListener() {
 
         @Override
-        public void onSessionAdded(SwitchConnectionDistinguisher sessionKey, SessionContext context) {
+        public void onSessionAdded(SwitchSessionKeyOF sessionKey, SessionContext context) {
             for (ListenerRegistration<SessionListener> listener : sessionListeners) {
                 try {
                     listener.getInstance().onSessionAdded(sessionKey, context);
@@ -169,6 +187,7 @@ public class SessionManagerOFImpl implements SessionManager {
             }
         }
 
+        @Override
         public void onSessionRemoved(SessionContext context) {
             for (ListenerRegistration<SessionListener> listener : sessionListeners) {
                 try {
@@ -179,9 +198,10 @@ public class SessionManagerOFImpl implements SessionManager {
             }
         }
     };
+    
 
     @Override
-    public Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, DataObject>>> getTranslatorMapping() {
+    public Map<TranslatorKey, Collection<IMDMessageTranslator<OfHeader, List<DataObject>>>> getTranslatorMapping() {
         return this.translatorMapping;
     }
 
@@ -208,4 +228,37 @@ public class SessionManagerOFImpl implements SessionManager {
         return notificationProviderService;
     }
 
+    @Override
+    public Map<Class<? extends DataObject>, Collection<PopListener<DataObject>>> getPopListenerMapping() {
+        return popListenerMapping;
+    }
+
+    @Override
+    public void setPopListenerMapping(
+            Map<Class<? extends DataObject>, Collection<PopListener<DataObject>>> popListenerMapping) {
+        this.popListenerMapping = popListenerMapping;
+    }
+    
+    @Override
+    public void close() {
+        LOG.debug("close");
+        sessionListeners = null;
+        synchronized (sessionLot) {
+            for (SessionContext sessionContext : sessionLot.values()) {
+                sessionContext.getPrimaryConductor().disconnect();
+            }
+            // TODO: handle timeouted shutdown
+            rpcPool.shutdown();
+        }
+    }
+
+    @Override
+    public void setRpcPool(ListeningExecutorService rpcPool) {
+        this.rpcPool = rpcPool;
+    }
+    
+    @Override
+    public ListeningExecutorService getRpcPool() {
+        return rpcPool;
+    }
 }