commit 67fd1e6233d3b8e4ddb2ed3300c841ed153ba86e
author Madan Jampani <madan@onlab.us> Fri Jul 01 10:26:23 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 05 19:51:22 2016 +0000
tree 38b24659935b75ec631917b2c650e72a0236f198
parent 6c0582e6f2ab33a8642b766747bd25077214f5f0

SecurityMode: Ensure store event handling happens in a background thread to avoid deadlocks

Change-Id: Id32b8ab0cf040cf2ed255f3527426f39bc58476c

core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java

diff --git a/core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java b/core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java
index fd3830a..144900f 100644
--- a/core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java
+++ b/core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java
@@ -28,8 +28,8 @@
 import org.apache.karaf.features.BundleInfo;
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;
-
 import org.onlab.util.KryoNamespace;
+import org.onlab.util.Tools;
 import org.onosproject.app.ApplicationAdminService;
 import org.onosproject.core.Application;
 import org.onosproject.core.ApplicationId;
@@ -49,6 +49,8 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 import static org.onosproject.security.store.SecurityModeState.*;
@@ -84,6 +86,9 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected FeaturesService featuresService;
 
+    private ExecutorService eventHandler;
+    private final SecurityStateListener statesListener = new SecurityStateListener();
+
     private static final Serializer STATE_SERIALIZER = Serializer.using(new KryoNamespace.Builder()
             .register(KryoNamespaces.API)
             .register(SecurityModeState.class)
@@ -97,12 +102,13 @@
 
     @Activate
     public void activate() {
+        eventHandler = Executors.newSingleThreadExecutor(Tools.groupedThreads("onos/security/store", "event-handler"));
         states = storageService.<ApplicationId, SecurityInfo>consistentMapBuilder()
                 .withName("smonos-sdata")
                 .withSerializer(STATE_SERIALIZER)
                 .build();
 
-        states.addListener(new SecurityStateListener());
+        states.addListener(statesListener, eventHandler);
 
         violations = storageService.<ApplicationId, Set<Permission>>eventuallyConsistentMapBuilder()
                 .withName("smonos-rperms")
@@ -119,6 +125,8 @@
 
     @Deactivate
     public void deactivate() {
+        states.removeListener(statesListener);
+        eventHandler.shutdown();
         violations.destroy();
         log.info("Stopped");
     }