Adding support for multiple destination ips

Netflix · Jul 24, 2020 · 78e3928 · 78e3928
1 parent c6a0534
commit 78e3928
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/evcache-core/src/main/java/com/netflix/evcache/EVCacheInternal.java b/evcache-core/src/main/java/com/netflix/evcache/EVCacheInternal.java
@@ -30,7 +30,7 @@ public interface EVCacheInternal extends EVCache {
 
     EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, String serverGroup) throws EVCacheException;
 
-    EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, String serverGroupName, String destinationIp) throws EVCacheException;
+    EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, String serverGroupName, List<String> destinationIps) throws EVCacheException;
 
     KeyHashedState isKeyHashed(String appName, String serverGroup);
 

diff --git a/evcache-core/src/main/java/com/netflix/evcache/EVCacheInternalImpl.java b/evcache-core/src/main/java/com/netflix/evcache/EVCacheInternalImpl.java
@@ -50,14 +50,14 @@ public EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value,
         return addOrSet(replaceItem, key, value, timeToLive, policy, serverGroupName, null);
     }
 
-    public EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, String serverGroupName, String destinationIp) throws EVCacheException {
+    public EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, String serverGroupName, List<String> destinationIps) throws EVCacheException {
         List<String> serverGroups = new ArrayList<>();
         serverGroups.add(serverGroupName);
 
-        return addOrSet(replaceItem, key, value, timeToLive, policy, serverGroups, destinationIp);
+        return addOrSet(replaceItem, key, value, timeToLive, policy, serverGroups, destinationIps);
     }
 
-    private EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, List<String> serverGroups, String destinationIp) throws EVCacheException {
+    private EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value, int timeToLive, EVCacheLatch.Policy policy, List<String> serverGroups, List<String> destinationIps) throws EVCacheException {
         Map<ServerGroup, List<EVCacheClient>> clientsByServerGroup = _pool.getAllInstancesByZone();
 
         List<EVCacheClient> evCacheClients = clientsByServerGroup.entrySet().stream()
@@ -66,12 +66,12 @@ private EVCacheLatch addOrSet(boolean replaceItem, String key, CachedData value,
                 .flatMap(List::stream)
                 .collect(Collectors.toList());
 
-        if (null != destinationIp && !destinationIp.isEmpty()) {
+        if (null != destinationIps && !destinationIps.isEmpty()) {
             // identify that evcache client whose primary node is the destination ip for the key being processed
             evCacheClients = evCacheClients.stream().filter(client ->
-                    ((InetSocketAddress) client.getNodeLocator()
+                    destinationIps.contains(((InetSocketAddress) client.getNodeLocator()
                         .getPrimary(getEVCacheKey(key).getDerivedKey(client.isDuetClient(), client.getHashingAlgorithm(), client.shouldEncodeHashKey(), client.getMaxHashingBytes()))
-                        .getSocketAddress()).getAddress().getHostAddress().equals(destinationIp)
+                        .getSocketAddress()).getAddress().getHostAddress())
             ).collect(Collectors.toList());
         }