commit c637188a34b9f11e753ddd2f3164ba94981da9d4
author Madan Jampani <madan@onlab.us> Fri Jun 03 21:30:17 2016 -0700
committer Madan Jampani <madan@onlab.us> Sat Jun 04 14:18:01 2016 -0700
tree d6f474aab91da31af5636e492ed8591ee15636ab
parent 78be249d5219805d488095ef62603d040394dd99

Removed operation retry wrappers around various consistent map/atomic counter operations

Change-Id: Ie6c22a983a01bf3488eff51a493554319c5d15f8

core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java b/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
index 855eefb..2d4fc4d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/config/impl/DistributedNetworkConfigStore.java
@@ -36,7 +36,6 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.util.KryoNamespace;
-import org.onlab.util.Tools;
 import org.onosproject.net.config.Config;
 import org.onosproject.net.config.ConfigApplyDelegate;
 import org.onosproject.net.config.ConfigFactory;
@@ -46,7 +45,6 @@
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.ConsistentMap;
-import org.onosproject.store.service.ConsistentMapException;
 import org.onosproject.store.service.MapEvent;
 import org.onosproject.store.service.MapEventListener;
 import org.onosproject.store.service.Serializer;
@@ -78,7 +76,6 @@
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private static final int MAX_BACKOFF = 10;
     private static final String INVALID_CONFIG_JSON =
             "JSON node does not contain valid configuration";
     private static final String INVALID_JSON_LIST =
@@ -232,9 +229,7 @@
 
     @Override
     public <S, T extends Config<S>> T getConfig(S subject, Class<T> configClass) {
-        // TODO: need to identify and address the root cause for timeouts.
-        Versioned<JsonNode> json = Tools.retryable(configs::get, ConsistentMapException.class, 1, MAX_BACKOFF)
-                .apply(key(subject, configClass));
+        Versioned<JsonNode> json = configs.get(key(subject, configClass));
         return json != null ? createConfig(subject, configClass, json.value()) : null;
     }