commit 492526abe0e937f7dc2b178679d601175deca5bb
author Madan Jampani <madan@onlab.us> Mon Jun 06 17:24:04 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jun 07 16:21:16 2016 +0000
tree 0059739b520ec115dfe167a2fc720098297301a0
parent cdf9b10912227b2910cff3859bf102a14c62e02f

Move cluster event handling off of event dispatcher thread to a background thread

Change-Id: I17261490898e51088e08ebd50c50c0ae962400d3

web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
index 7cb0ffc..37ac126 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
@@ -16,12 +16,16 @@
 
 package org.onosproject.ui.impl.topo.model;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.util.Tools;
 import org.onosproject.cluster.ClusterEvent;
 import org.onosproject.cluster.ClusterEventListener;
 import org.onosproject.cluster.ClusterService;
@@ -117,6 +121,8 @@
     private final FlowRuleListener flowRuleListener =
             new InternalFlowRuleListener();
 
+    private ExecutorService eventHandler;
+
 
     private ModelCache cache;
 
@@ -124,6 +130,7 @@
     @Activate
     protected void activate() {
         cache = new ModelCache(new DefaultServiceBundle(), eventDispatcher);
+        eventHandler = Executors.newSingleThreadExecutor(Tools.groupedThreads("onos/ui/topo", "event-handler"));
 
         eventDispatcher.addSink(UiModelEvent.class, listenerRegistry);
 
@@ -154,6 +161,8 @@
         intentService.removeListener(intentListener);
         flowService.removeListener(flowRuleListener);
 
+        eventHandler.shutdown();
+
         cache.clear();
         cache = null;
 
@@ -231,6 +240,10 @@
     private class InternalClusterListener implements ClusterEventListener {
         @Override
         public void event(ClusterEvent event) {
+            eventHandler.execute(() -> handleEvent(event));
+        }
+
+        private void handleEvent(ClusterEvent event) {
             ControllerNode cnode = event.subject();
 
             switch (event.type()) {