q!

Merge branch 'master' of github.com:Netflix/EVCache
x

Author: smadappa

evcache-client/src/main/java/com/netflix/evcache/EVCacheImpl.java

@@ -1664,10 +1664,10 @@ public <T> Future<Boolean>[] appendOrAdd(String key, T value, Transcoder<T> tc,
     }
 
     public <T> boolean add(String key, T value, Transcoder<T> tc, int timeToLive) throws EVCacheException {
-        final EVCacheLatch latch = add(key, value, tc, timeToLive, Policy.ALL);
+        final EVCacheLatch latch = add(key, value, tc, timeToLive, Policy.NONE);
         try {
             latch.await(_pool.getOperationTimeout().get(), TimeUnit.MILLISECONDS);
-            return (latch.getSuccessCount() == latch.getExpectedSuccessCount());
+            return (latch.getSuccessCount() >= latch.getExpectedSuccessCount());
         } catch (InterruptedException e) {
             if (log.isDebugEnabled() && shouldLog()) log.debug("Exception adding the data for APP " + _appName + ", key : " + key, e);
             final boolean throwExc = doThrowException();

evcache-client/src/main/java/com/netflix/evcache/pool/EVCacheClientUtil.java

@@ -144,7 +144,7 @@ public void run() {
                                 final EVCacheClient client = _pool.getEVCacheClient(f.getServerGroup());
                                 if(client != null) {
                                     try {
-                                        client.set(canonicalKey, readData, timeToLive, latch);
+                                        client.set(canonicalKey, readData, timeToLive, null);
                                         if(log.isDebugEnabled()) log.debug("Add: Fixup for : APP " + _appName + ", key " + canonicalKey + "; ServerGroup : " + client.getServerGroupName());
                                         EVCacheMetricsFactory.increment(_appName , null, client.getServerGroupName(), _appName + "-AddCall-FixUp");
                                     } catch (Exception e) {