Bug 8917 - CSIT Sporadic failures - Arp learning suite - missing flow on

compute node

Remote FIB Flow installation was failing due to OptimisticLockException.
The DJCs involved in this operation is now modified in the L3 Application
to retry on failure.

Change-Id: Ifdb4d3735892de28fb73b6b563878d059d8298ee
Signed-off-by: eupakir <kiran.n.upadhyaya@ericsson.com>

diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
index f9ca6513101ab09f980e739690828cf1e953dbd9..1c38f518d0c0abc10a89280e8239cae7979f0ee4 100755 (executable)
--- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
+++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java
@@ -108,6 +108,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase<VrfEntry,
     private static final int DEFAULT_FIB_FLOW_PRIORITY = 10;
     private static final int LFIB_INTERVPN_PRIORITY = 15;
     public static final BigInteger COOKIE_TUNNEL = new BigInteger("9000000", 16);
+    private static final int DJC_MAX_RETRIES = 3;
 
     private final DataBroker dataBroker;
     private final IMdsalApiManager mdsalManager;
@@ -376,7 +377,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase<VrfEntry,
                     List<ListenableFuture<Void>> futures = new ArrayList<>();
                     futures.add(tx.submit());
                     return futures;
-                });
+                }, DJC_MAX_RETRIES);
             }
         }
 
@@ -1356,7 +1357,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase<VrfEntry,
                     List<ListenableFuture<Void>> futures = new ArrayList<>();
                     futures.add(tx.submit());
                     return futures;
-                });
+                }, DJC_MAX_RETRIES);
         }
 
         //The flow/group entry has been deleted from config DS; need to clean up associated operational