commit 6b5b717d8014242e2beaee24935f8e620244a3cd
author Madan Jampani <madan@onlab.us> Mon Feb 23 13:02:26 2015 -0800
committer Ray Milkey <ray@onlab.us> Mon Feb 23 22:40:56 2015 +0000
tree c818bf2406b7ae1eef9bab33e539dd81d0354c77
parent dbeab4cc33e3779a7698a6a1f500fa8484a17597

Gave threadpools more appropriate names.

Change-Id: Ib7ce71a3028363b1465fbd5775f84e2befaf80c1

core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
index 1c3c098..805c9ca 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
@@ -89,9 +89,7 @@
         INSTALLED, ACTIVATED, DEACTIVATED
     }
 
-    private final ScheduledExecutorService executor =
-            Executors.newSingleThreadScheduledExecutor(groupedThreads("onos/app", "store"));
-
+    private ScheduledExecutorService executor;
     private ExecutorService messageHandlingExecutor;
 
     private EventuallyConsistentMap<ApplicationId, Application> apps;
@@ -113,6 +111,8 @@
                 .register(KryoNamespaces.API)
                 .register(InternalState.class);
 
+        executor = Executors.newSingleThreadScheduledExecutor(groupedThreads("onos/app", "store"));
+
         messageHandlingExecutor = Executors.newSingleThreadExecutor(
                 groupedThreads("onos/store/app", "message-handler"));
 
@@ -154,6 +154,7 @@
     public void deactivate() {
         clusterCommunicator.removeSubscriber(APP_BITS_REQUEST);
         messageHandlingExecutor.shutdown();
+        executor.shutdown();
         apps.destroy();
         states.destroy();
         permissions.destroy();

core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index e28a753..80f2914 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -178,7 +178,7 @@
 
         messageHandlingExecutor = Executors.newFixedThreadPool(
                 MESSAGE_HANDLER_THREAD_POOL_SIZE,
-                groupedThreads("onos/flow", "message-handlers"));
+                groupedThreads("onos/store/flow", "message-handlers"));
 
         clusterCommunicator.addSubscriber(APPLY_BATCH_FLOWS, new OnStoreBatch(local), messageHandlingExecutor);
 

core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
index 35e28c7..eb0c38a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
@@ -89,7 +89,7 @@
     public void activate() {
         messageHandlingExecutor =  Executors.newFixedThreadPool(
                 MESSAGE_HANDLER_THREAD_POOL_SIZE,
-                groupedThreads("onos/flow", "message-handlers"));
+                groupedThreads("onos/store/packet", "message-handlers"));
 
         communicationService.addSubscriber(
                 PACKET_OUT_SUBJECT, new InternalClusterMessageHandler(), messageHandlingExecutor);