홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Ray Milkey
6b5b717d 1 parent dbeab4cc

Gave threadpools more appropriate names. 

Change-Id: Ib7ce71a3028363b1465fbd5775f84e2befaf80c1
Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
...@@ -89,9 +89,7 @@ public class GossipApplicationStore extends ApplicationArchive ...@@ -89,9 +89,7 @@ public class GossipApplicationStore extends ApplicationArchive
89 INSTALLED, ACTIVATED, DEACTIVATED 89 INSTALLED, ACTIVATED, DEACTIVATED
90 } 90 }
91 91
92 - private final ScheduledExecutorService executor = 92 + private ScheduledExecutorService executor;
93 - Executors.newSingleThreadScheduledExecutor(groupedThreads("onos/app", "store"));
94 -
95 private ExecutorService messageHandlingExecutor; 93 private ExecutorService messageHandlingExecutor;
96 94
97 private EventuallyConsistentMap<ApplicationId, Application> apps; 95 private EventuallyConsistentMap<ApplicationId, Application> apps;
...@@ -113,6 +111,8 @@ public class GossipApplicationStore extends ApplicationArchive ...@@ -113,6 +111,8 @@ public class GossipApplicationStore extends ApplicationArchive
113 .register(KryoNamespaces.API) 111 .register(KryoNamespaces.API)
114 .register(InternalState.class); 112 .register(InternalState.class);
115 113
114 + executor = Executors.newSingleThreadScheduledExecutor(groupedThreads("onos/app", "store"));
115 +
116 messageHandlingExecutor = Executors.newSingleThreadExecutor( 116 messageHandlingExecutor = Executors.newSingleThreadExecutor(
117 groupedThreads("onos/store/app", "message-handler")); 117 groupedThreads("onos/store/app", "message-handler"));
118 118
...@@ -154,6 +154,7 @@ public class GossipApplicationStore extends ApplicationArchive ...@@ -154,6 +154,7 @@ public class GossipApplicationStore extends ApplicationArchive
154 public void deactivate() { 154 public void deactivate() {
155 clusterCommunicator.removeSubscriber(APP_BITS_REQUEST); 155 clusterCommunicator.removeSubscriber(APP_BITS_REQUEST);
156 messageHandlingExecutor.shutdown(); 156 messageHandlingExecutor.shutdown();
157 + executor.shutdown();
157 apps.destroy(); 158 apps.destroy();
158 states.destroy(); 159 states.destroy();
159 permissions.destroy(); 160 permissions.destroy();
......
...@@ -178,7 +178,7 @@ public class DistributedFlowRuleStore ...@@ -178,7 +178,7 @@ public class DistributedFlowRuleStore
178 178
179 messageHandlingExecutor = Executors.newFixedThreadPool( 179 messageHandlingExecutor = Executors.newFixedThreadPool(
180 MESSAGE_HANDLER_THREAD_POOL_SIZE, 180 MESSAGE_HANDLER_THREAD_POOL_SIZE,
181 - groupedThreads("onos/flow", "message-handlers")); 181 + groupedThreads("onos/store/flow", "message-handlers"));
182 182
183 clusterCommunicator.addSubscriber(APPLY_BATCH_FLOWS, new OnStoreBatch(local), messageHandlingExecutor); 183 clusterCommunicator.addSubscriber(APPLY_BATCH_FLOWS, new OnStoreBatch(local), messageHandlingExecutor);
184 184
......
...@@ -89,7 +89,7 @@ public class DistributedPacketStore ...@@ -89,7 +89,7 @@ public class DistributedPacketStore
89 public void activate() { 89 public void activate() {
90 messageHandlingExecutor = Executors.newFixedThreadPool( 90 messageHandlingExecutor = Executors.newFixedThreadPool(
91 MESSAGE_HANDLER_THREAD_POOL_SIZE, 91 MESSAGE_HANDLER_THREAD_POOL_SIZE,
92 - groupedThreads("onos/flow", "message-handlers")); 92 + groupedThreads("onos/store/packet", "message-handlers"));
93 93
94 communicationService.addSubscriber( 94 communicationService.addSubscriber(
95 PACKET_OUT_SUBJECT, new InternalClusterMessageHandler(), messageHandlingExecutor); 95 PACKET_OUT_SUBJECT, new InternalClusterMessageHandler(), messageHandlingExecutor);
......