Properly filter out the latest leader in the ClusterMembership set (#…

…1258)
Netflix · Apr 12, 2022 · a8fbdd3 · a8fbdd3
1 parent 82f977f
commit a8fbdd3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...a/com/netflix/titus/client/clustermembership/resolver/MultiNodeClusterMemberResolver.java b/...a/com/netflix/titus/client/clustermembership/resolver/MultiNodeClusterMemberResolver.java
@@ -179,19 +179,24 @@ private ClusterMembershipSnapshot buildSnapshot() {
         builder.withMemberRevisions(recentRevisions);
 
         // Find leader
-        Optional<ClusterMembershipRevision<ClusterMemberLeadership>> recentLeader = Optional.empty();
+        ClusterMembershipRevision<ClusterMemberLeadership> latestLeader = null;
         for (ClusterMembershipSnapshot snapshot : healthySnapshots) {
-            if (snapshot.getLeaderRevision().isPresent()) {
-                if (recentLeader.isPresent()) {
-                    if (recentLeader.get().getRevision() < snapshot.getLeaderRevision().get().getRevision()) {
-                        recentLeader = snapshot.getLeaderRevision();
+            ClusterMembershipRevision<ClusterMemberLeadership> snapshotLeader = snapshot.getLeaderRevision().orElse(null);
+            if (snapshotLeader != null) {
+                if (latestLeader != null) {
+                    if(latestLeader.getCurrent().getMemberId().equals(snapshotLeader.getCurrent().getMemberId())) {
+                        latestLeader = latestLeader.getRevision() < snapshotLeader.getRevision() ? snapshotLeader : latestLeader;
+                    } else {
+                        latestLeader = latestLeader.getTimestamp() < snapshotLeader.getTimestamp() ? snapshotLeader : latestLeader;
                     }
                 } else {
-                    recentLeader = snapshot.getLeaderRevision();
+                    latestLeader = snapshotLeader;
                 }
             }
         }
-        recentLeader.ifPresent(builder::withLeaderRevision);
+        if(latestLeader != null) {
+            builder.withLeaderRevision(latestLeader);
+        }
 
         // Choose latest version of each
         long minStaleness = healthySnapshots.stream()

diff --git a/...etflix/titus/ext/kube/clustermembership/connector/KubeClusterMembershipConfiguration.java b/...etflix/titus/ext/kube/clustermembership/connector/KubeClusterMembershipConfiguration.java
@@ -61,7 +61,7 @@ public interface KubeClusterMembershipConfiguration {
     /**
      * Data staleness threshold above which the registration data are removed.
      */
-    @DefaultValue("600000")
+    @DefaultValue("180000")
     long getRegistrationCleanupThresholdMs();
 
     @DefaultValue("500")