commit 1012d7bfa907aeeb49609cd0e7d11a7d42f3aaf8
author Sacheth Hegde <sacheth@waltznetworks.com> Mon May 07 17:11:34 2018 -0700
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue May 08 17:47:39 2018 +0000
tree 519d7b1a9e7bb9123e7ba99063730e194231891a
parent 0b53f9520f1e91d697917119cfe8ba37f63bb727

Add retry for ResourceSubStores

Change-Id: Ie7f05f4d34813618ee785697d34a0903183f3036
(cherry picked from commit 5a91f39cecb77333f7a7523490a5fcd4c23ef062)

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
index e6282dc..be9d592 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
@@ -17,6 +17,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import org.onlab.util.Tools;
 import org.onosproject.net.resource.ContinuousResource;
 import org.onosproject.net.resource.ContinuousResourceId;
 import org.onosproject.net.resource.DiscreteResourceId;
@@ -24,6 +25,7 @@
 import org.onosproject.net.resource.ResourceAllocation;
 import org.onosproject.net.resource.ResourceConsumerId;
 import org.onosproject.store.service.ConsistentMap;
+import org.onosproject.store.service.StorageException;
 import org.onosproject.store.service.StorageService;
 import org.onosproject.store.service.TransactionContext;
 import org.onosproject.store.service.Versioned;
@@ -55,7 +57,12 @@
                 .withSerializer(SERIALIZER)
                 .build();
 
-        childMap.putIfAbsent(Resource.ROOT.id(), new LinkedHashSet<>());
+        Tools.retryable(
+                () -> childMap.putIfAbsent(Resource.ROOT.id(), new LinkedHashSet<>()),
+                StorageException.ConcurrentModification.class,
+                Integer.MAX_VALUE,
+                50
+        ).get();
     }
 
     @Override

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceSubStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceSubStore.java
index d70916e..9135230 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceSubStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDiscreteResourceSubStore.java
@@ -17,6 +17,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import org.onlab.util.Tools;
 import org.onosproject.net.resource.DiscreteResource;
 import org.onosproject.net.resource.DiscreteResourceId;
 import org.onosproject.net.resource.Resource;
@@ -24,6 +25,7 @@
 import org.onosproject.net.resource.ResourceConsumerId;
 import org.onosproject.net.resource.Resources;
 import org.onosproject.store.service.ConsistentMap;
+import org.onosproject.store.service.StorageException;
 import org.onosproject.store.service.StorageService;
 import org.onosproject.store.service.TransactionContext;
 import org.onosproject.store.service.Versioned;
@@ -53,7 +55,12 @@
                 .withSerializer(SERIALIZER)
                 .build();
 
-        childMap.putIfAbsent(Resource.ROOT.id(), DiscreteResources.empty());
+        Tools.retryable(
+                () -> childMap.putIfAbsent(Resource.ROOT.id(), DiscreteResources.empty()),
+                StorageException.ConcurrentModification.class,
+                Integer.MAX_VALUE,
+                50
+        ).get();
     }
 
     @Override