- remove failback candidate

- fix failing tests

Author: atakavci

src/main/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProvider.java

@@ -280,8 +280,7 @@ private void handleStatusChange(HealthStatusChangeEvent eventArgs) {
         clusterWithHealthChange.setHealthStatus(newStatus);
 
         if (newStatus.isHealthy()) {
-            if (clusterWithHealthChange.isFailbackSupported() && clusterWithHealthChange.isFailbackCandidate()
-                && activeCluster != clusterWithHealthChange) {
+            if (clusterWithHealthChange.isFailbackSupported() && activeCluster != clusterWithHealthChange) {
                 // lets check if weighted switching is possible
                 Map.Entry<Endpoint, Cluster> failbackCluster = findWeightedHealthyClusterToIterate();
                 if (failbackCluster == clusterWithHealthChange
@@ -307,9 +306,6 @@ public Endpoint iterateActiveCluster() {
         Cluster cluster = clusterToIterate.getValue();
         boolean changed = setActiveCluster(cluster, false);
         if (!changed) return null;
-        if (cluster.isFailbackSupported()) {
-            cluster.setFailbackCandidate(false);
-        }
         return clusterToIterate.getKey();
     }
 
@@ -471,9 +467,7 @@ public static class Cluster {
         // it starts its life with the assumption of being healthy
         private HealthStatus healthStatus = HealthStatus.HEALTHY;
         private MultiClusterClientConfig multiClusterClientConfig;
-        // it starts its life as a failback candidate,
-        // this changes under the condition that cluster failover to another and failback is not supported by client
-        private boolean failbackCandidate = true;
+        private boolean disabled = false;
 
         public Cluster(ConnectionPool connectionPool, Retry retry, CircuitBreaker circuitBreaker, float weight,
             MultiClusterClientConfig multiClusterClientConfig) {
@@ -520,26 +514,19 @@ public boolean isCBForcedOpen() {
         }
 
         public boolean isHealthy() {
-            return healthStatus.isHealthy() && !isCBForcedOpen();
+            return healthStatus.isHealthy() && !isCBForcedOpen() && !disabled;
         }
 
-        /**
-         * Whether this cluster is a failback candidate Cluster starts its life as a failback candidate, this changes
-         * under the condition that cluster failover to another and failback is not supported by client
-         */
-        public boolean isFailbackCandidate() {
-            return failbackCandidate;
+        public boolean retryOnFailover() {
+            return multiClusterClientConfig.isRetryOnFailover();
         }
 
-        /**
-         * Sets this cluster as a failback candidate
-         */
-        public void setFailbackCandidate(boolean failbackCandidate) {
-            this.failbackCandidate = failbackCandidate;
+        public boolean isDisabled() {
+            return disabled;
         }
 
-        public boolean retryOnFailover() {
-            return multiClusterClientConfig.isRetryOnFailover();
+        public void setDisabled(boolean disabled) {
+            this.disabled = disabled;
         }
 
         /**
@@ -553,8 +540,7 @@ public boolean isFailbackSupported() {
         public String toString() {
             return circuitBreaker.getName() + "{" + "connectionPool=" + connectionPool + ", retry=" + retry
                 + ", circuitBreaker=" + circuitBreaker + ", weight=" + weight + ", healthStatus=" + healthStatus
-                + ", multiClusterClientConfig=" + multiClusterClientConfig + ", failbackCandidate=" + failbackCandidate
-                + '}';
+                + ", multiClusterClientConfig=" + multiClusterClientConfig + '}';
         }
     }
 

src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java

@@ -9,7 +9,6 @@
 import redis.clients.jedis.exceptions.JedisValidationException;
 import redis.clients.jedis.mcf.Endpoint;
 
-
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -36,7 +35,7 @@ public void setUp() {
             .weight(0.3f).build();
 
         provider = new MultiClusterPooledConnectionProvider(
-            new MultiClusterClientConfig.Builder(clusterConfigs).failbackSupported(false).build());
+            new MultiClusterClientConfig.Builder(clusterConfigs).build());
     }
 
     @Test
@@ -56,37 +55,31 @@ public void testCircuitBreakerForcedTransitions() {
     }
 
     @Test
-    public void testIncrementActiveMultiClusterIndex() {
+    public void testIterateActiveCluster() {
         Endpoint e2 = provider.iterateActiveCluster();
         assertEquals(endpointStandalone1.getHostAndPort(), e2);
     }
 
     @Test
-    public void testIncrementActiveMultiClusterIndexOutOfRange() {
+    public void testIterateActiveClusterOutOfRange() {
         provider.setActiveCluster(endpointStandalone0.getHostAndPort());
+        provider.getCluster().setDisabled(true);
 
         Endpoint e2 = provider.iterateActiveCluster();
+        provider.getCluster().setDisabled(true);
+
         assertEquals(endpointStandalone1.getHostAndPort(), e2);
 
         assertThrows(JedisConnectionException.class, () -> provider.iterateActiveCluster()); // Should throw an
                                                                                              // exception
     }
 
     @Test
-    public void testIsLastClusterCircuitBreakerForcedOpen() {
+    public void testCanIterateOnceMore() {
         provider.setActiveCluster(endpointStandalone0.getHostAndPort());
-
-        try {
-            provider.iterateActiveCluster();
-        } catch (Exception e) {
-        }
-
-        // This should set the isLastClusterCircuitBreakerForcedOpen to true
-        try {
-            provider.iterateActiveCluster();
-        } catch (Exception e) {
-        }
-
+        provider.getCluster().setDisabled(true);
+        provider.iterateActiveCluster();
+        
         assertFalse(provider.canIterateOnceMore());
     }