commit ad640f81fb1c6c4d6ee1ccf2e8bcbb5f7ef1f9e7
author Tunahan Sezen <tunahan.sezen@netsia.com> Wed Apr 28 10:23:44 2021 +0000
committer Tunahan Sezen <tunahan.sezen@netsia.com> Mon May 17 14:04:06 2021 +0300
tree 8e07e2f32990b0847b42fbfaa66fdfe4ecc0821e
parent ded7fe70d16bec3407f85d8c248eb2210937500f

[VOL-4046] Processing Device Events in DhcpL2Relay in Separated Thread

Change-Id: Ic3b6406ade44e2e233e1c4137fd93ee6239c84c6

app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java

diff --git a/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java b/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
index 1f49d40..1980851 100755
--- a/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
+++ b/app/src/main/java/org/opencord/dhcpl2relay/impl/DhcpL2Relay.java
@@ -16,6 +16,7 @@
 package org.opencord.dhcpl2relay.impl;
 
 import static java.util.concurrent.Executors.newFixedThreadPool;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.onlab.packet.DHCP.DHCPOptionCode.OptionCode_MessageType;
 import static org.onlab.packet.MacAddress.valueOf;
 import static org.onlab.util.Tools.groupedThreads;
@@ -239,6 +240,7 @@
     private DhcpL2RelayStoreDelegate delegate = new InnerDhcpL2RelayStoreDelegate();
 
     protected ExecutorService packetProcessorExecutor;
+    protected ExecutorService eventHandlerExecutor;
 
     @Activate
     protected void activate(ComponentContext context) {
@@ -263,6 +265,8 @@
 
         dhcpL2RelayCounters.setDelegate(delegate);
 
+        eventHandlerExecutor = newSingleThreadExecutor(groupedThreads("onos/dhcp", "dhcp-event-%d", log));
+
         cfgService.addListener(cfgListener);
         mastershipService.addListener(changeListener);
         deviceService.addListener(deviceListener);
@@ -302,6 +306,7 @@
         cancelDhcpPktsFromServer();
 
         packetProcessorExecutor.shutdown();
+        eventHandlerExecutor.shutdown();
         componentConfigService.unregisterProperties(getClass(), false);
         deviceService.removeListener(deviceListener);
         mastershipService.removeListener(changeListener);
@@ -1310,7 +1315,10 @@
 
         @Override
         public void event(NetworkConfigEvent event) {
+            eventHandlerExecutor.submit(() -> handleNetworkConfigEventEvent(event));
+        }
 
+        private void handleNetworkConfigEventEvent(NetworkConfigEvent event) {
             if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED ||
                     event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED) &&
                     event.configClass().equals(DhcpL2RelayConfig.class)) {
@@ -1327,11 +1335,15 @@
     private class InnerMastershipListener implements MastershipListener {
         @Override
         public void event(MastershipEvent event) {
+            eventHandlerExecutor.submit(() -> handleMastershipEvent(event));
+        }
+
+        private void handleMastershipEvent(MastershipEvent event) {
             if (!useOltUplink) {
                 if (dhcpServerConnectPoint.get() != null &&
                         dhcpServerConnectPoint.get().deviceId().
                                 equals(event.subject())) {
-                    log.trace("Mastership Event recevived for {}", event.subject());
+                    log.trace("Mastership Event received for {}", event.subject());
                     // mastership of the device for our connect point has changed
                     // reselect
                     selectServerConnectPoint();
@@ -1393,6 +1405,10 @@
     private class InnerDeviceListener implements DeviceListener {
         @Override
         public void event(DeviceEvent event) {
+            eventHandlerExecutor.submit(() -> handleDeviceEvent(event));
+        }
+
+        private void handleDeviceEvent(DeviceEvent event) {
             final DeviceId deviceId = event.subject().id();
 
             // Ensure only one instance handles the event