Decrement expectedNumberOfClientsSendingRenews for expired leases (#1271

) Move the logic that decrements the expected number of clients into cancelInternal - this should ensure that we're calling it both for explicit cancels as well as well as when the instance lease expires. Fixes #1266.
Netflix · Jan 27, 2020 · cefadab · cefadab
1 parent 1ef3c55
commit cefadab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java
@@ -326,11 +326,20 @@ protected boolean internalCancel(String appName, String id, boolean isReplicatio
                 }
                 invalidateCache(appName, vip, svip);
                 logger.info("Cancelled instance {}/{} (replication={})", appName, id, isReplication);
-                return true;
             }
         } finally {
             read.unlock();
         }
+
+        synchronized (lock) {
+            if (this.expectedNumberOfClientsSendingRenews > 0) {
+                // Since the client wants to cancel it, reduce the number of clients to send renews.
+                this.expectedNumberOfClientsSendingRenews = this.expectedNumberOfClientsSendingRenews - 1;
+                updateRenewsPerMinThreshold();
+            }
+        }
+
+        return true;
     }
 
     /**

diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java b/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java
@@ -377,13 +377,7 @@ public boolean cancel(final String appName, final String id,
                           final boolean isReplication) {
         if (super.cancel(appName, id, isReplication)) {
             replicateToPeers(Action.Cancel, appName, id, null, null, isReplication);
-            synchronized (lock) {
-                if (this.expectedNumberOfClientsSendingRenews > 0) {
-                    // Since the client wants to cancel it, reduce the number of clients to send renews
-                    this.expectedNumberOfClientsSendingRenews = this.expectedNumberOfClientsSendingRenews - 1;
-                    updateRenewsPerMinThreshold();
-                }
-            }
+
             return true;
         }
         return false;