cherry picking the fix for ONOS-4754 to onos-1.6 and master

Change-Id: I2c7da62479566f16034b598029df5f98a37cc99e

@@ -120,6 +120,14 @@ public class OpenFlowControllerImpl implements OpenFlowController {
     private final ExecutorService executorBarrier =
     private final ExecutorService executorBarrier =
         Executors.newFixedThreadPool(4, groupedThreads("onos/of", "event-barrier-%d", log));
         Executors.newFixedThreadPool(4, groupedThreads("onos/of", "event-barrier-%d", log));
 
 
+    //Separate executor thread for handling error messages and barrier replies for same failed
+    // transactions to avoid context switching of thread
+    protected ExecutorService executorErrorMsgs =
+            Executors.newSingleThreadExecutor(groupedThreads("onos/of", "event-error-msg-%d", log));
+
+    //concurrent hashmap to track failed transactions
+    protected ConcurrentMap<Long, Boolean> errorMsgs =
+            new ConcurrentHashMap<>();
     protected ConcurrentMap<Dpid, OpenFlowSwitch> connectedSwitches =
     protected ConcurrentMap<Dpid, OpenFlowSwitch> connectedSwitches =
             new ConcurrentHashMap<>();
             new ConcurrentHashMap<>();
     protected ConcurrentMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
     protected ConcurrentMap<Dpid, OpenFlowSwitch> activeMasterSwitches =
@@ -294,9 +302,13 @@ public class OpenFlowControllerImpl implements OpenFlowController {
         // TODO: Consider using separate threadpool for sensitive messages.
         // TODO: Consider using separate threadpool for sensitive messages.
         //    ie. Back to back error could cause us to starve.
         //    ie. Back to back error could cause us to starve.
         case FLOW_REMOVED:
         case FLOW_REMOVED:
-        case ERROR:
             executorMsgs.execute(new OFMessageHandler(dpid, msg));
             executorMsgs.execute(new OFMessageHandler(dpid, msg));
             break;
             break;
+        case ERROR:
+            log.debug("Received error message from {}: {}", dpid, msg);
+            errorMsgs.putIfAbsent(msg.getXid(), true);
+            executorErrorMsgs.execute(new OFMessageHandler(dpid, msg));
+            break;
         case STATS_REPLY:
         case STATS_REPLY:
             OFStatsReply reply = (OFStatsReply) msg;
             OFStatsReply reply = (OFStatsReply) msg;
             switch (reply.getStatsType()) {
             switch (reply.getStatsType()) {
@@ -403,7 +415,14 @@ public class OpenFlowControllerImpl implements OpenFlowController {
             }
             }
             break;
             break;
         case BARRIER_REPLY:
         case BARRIER_REPLY:
-            executorBarrier.execute(new OFMessageHandler(dpid, msg));
+            if (errorMsgs.containsKey(msg.getXid())) {
+                //To make oferror msg handling and corresponding barrier reply serialized,
+                // executorErrorMsgs is used for both transaction
+                errorMsgs.remove(msg.getXid());
+                executorErrorMsgs.execute(new OFMessageHandler(dpid, msg));
+            } else {
+                executorBarrier.execute(new OFMessageHandler(dpid, msg));
+            }
             break;
             break;
         case EXPERIMENTER:
         case EXPERIMENTER:
             long experimenter = ((OFExperimenter) msg).getExperimenter();
             long experimenter = ((OFExperimenter) msg).getExperimenter();

@@ -52,7 +52,7 @@ public class OpenFlowControllerImplPacketsTest {
     OpenFlowSwitchListenerAdapter switchListener;
     OpenFlowSwitchListenerAdapter switchListener;
     TestPacketListener packetListener;
     TestPacketListener packetListener;
     TestExecutorService statsExecutorService;
     TestExecutorService statsExecutorService;
-
+    TestExecutorService errorMsgExecutorService;
     /**
     /**
      * Mock packet listener that accumulates packets.
      * Mock packet listener that accumulates packets.
      */
      */
@@ -109,8 +109,10 @@ public class OpenFlowControllerImplPacketsTest {
         controller.addPacketListener(100, packetListener);
         controller.addPacketListener(100, packetListener);
 
 
         statsExecutorService = new TestExecutorService();
         statsExecutorService = new TestExecutorService();
+        errorMsgExecutorService = new TestExecutorService();
 
 
         controller.executorMsgs = statsExecutorService;
         controller.executorMsgs = statsExecutorService;
+        controller.executorErrorMsgs = errorMsgExecutorService;
     }
     }
 
 
     /**
     /**
@@ -147,7 +149,7 @@ public class OpenFlowControllerImplPacketsTest {
         agent.addConnectedSwitch(dpid1, switch1);
         agent.addConnectedSwitch(dpid1, switch1);
         OfMessageAdapter errorPacket = new OfMessageAdapter(OFType.ERROR);
         OfMessageAdapter errorPacket = new OfMessageAdapter(OFType.ERROR);
         controller.processPacket(dpid1, errorPacket);
         controller.processPacket(dpid1, errorPacket);
-        assertThat(statsExecutorService.submittedMessages(), hasSize(1));
-        assertThat(statsExecutorService.submittedMessages().get(0), is(errorPacket));
+        assertThat(errorMsgExecutorService.submittedMessages(), hasSize(1));
+        assertThat(errorMsgExecutorService.submittedMessages().get(0), is(errorPacket));
     }
     }
 }
 }