Updates for the latest changes to the cross-cluster-failover PR

Author: viragtripathi

README.md

@@ -208,8 +208,8 @@ RedisBenchmark.jedisSimpleSet   avgt       0.119           ms/op
 </p>
 </details>
 
-#### Fallback Tests:
-The test framework creates a pid file with MultiClusterIndex under jedisPid folder in the current folder (user directory). If you need to fallback to another database endpoint from provided `redis.connection` comma separated list of endpoints, then move the pid file to that index (Indexes are ordered from 1 to however many endpoints you provide)
+#### FaILback Tests:
+The test framework creates a pid file with MultiClusterIndex under jedisPid folder in the current folder (user directory). If you need to failback to another database endpoint from provided `redis.connection` comma separated list of endpoints, then move the pid file to that index (Indexes are ordered from 1 to however many endpoints you provide)
 ````bash
 mv jedisPid/1.pid jedisPid/2.pid
 ````
@@ -220,7 +220,7 @@ Creating 618 of 100000 key(s) to the benchmark:  [.....] 0%
 Detected file delete event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/1.pid
 
 Detected file create event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/2.pid
-User have requested to fallback to MultiClusterIndex 2
+User have requested to failback to ActiveMultiClusterIndex=2
 Creating 623 of 100000 key(s) to the benchmark:  [.....] 0%[Thread-3] WARN redis.clients.jedis.providers.MultiClusterPooledConnectionProvider - CircuitBreaker changed the connection pool from 'cluster:1:127.0.0.1:14002' to 'cluster:2:127.0.0.1:14003'
 ````
 ````bash
@@ -232,7 +232,7 @@ Creating 1405 of 100000 key(s) to the benchmark:  [.....] 1%
 Detected file delete event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/2.pid
 
 Detected file create event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/3.pid
-User have requested to fallback to MultiClusterIndex 3
+User have requested to failback to ActiveMultiClusterIndex=3
 Creating 1410 of 100000 key(s) to the benchmark:  [.....] 1%[Thread-3] WARN redis.clients.jedis.providers.MultiClusterPooledConnectionProvider - CircuitBreaker changed the connection pool from 'cluster:2:127.0.0.1:14003' to 'cluster:3:127.0.0.1:14004'
 Creating 2691 of 100000 key(s) to the benchmark:  [.....] 2%
 ````
@@ -243,7 +243,7 @@ Expected output:
 ````log
 Creating 2691 of 100000 key(s) to the benchmark:  [.....] 2%
 Detected file create event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/1.pid
-User have requested to fallback to MultiClusterIndex 1
+User have requested to failback to ActiveMultiClusterIndex=1
 Creating 2692 of 100000 key(s) to the benchmark:  [.....] 2%
 Detected file delete event. File: /Users/viragtripathi/idea_workspace/redis-benchmark/jedisPid/3.pid
 [Thread-3] WARN redis.clients.jedis.providers.MultiClusterPooledConnectionProvider - CircuitBreaker changed the connection pool from 'cluster:3:127.0.0.1:14004' to 'cluster:1:127.0.0.1:14002'

src/main/java/com/redis/benchmark/utils/FileEventListener.java

@@ -26,9 +26,9 @@ public void start(String dir, int pollInterval) throws Exception {
             @Override
             public void onFileCreate(File file) {
                 System.out.println("\nDetected file create event. File: " + file);
-                int fallBackIndex = Integer.parseInt(file.getName().substring(0, 1));
-                System.out.println("User have requested to fallback to MultiClusterIndex " + fallBackIndex);
-                JedisConnectionManagement.provider.setActiveMultiClusterIndex(fallBackIndex);
+                int activeClusterFailBackIndex = Integer.parseInt(file.getName().substring(0, 1));
+                System.out.println("User have requested to failback to ActiveMultiClusterIndex=" + activeClusterFailBackIndex);
+                JedisConnectionManagement.provider.setActiveMultiClusterIndex(activeClusterFailBackIndex);
             }
 
             @Override
@@ -39,9 +39,9 @@ public void onFileDelete(File file) {
             @Override
             public void onFileChange(File file) {
                 System.out.println("\nDetected file change event. File: " + file);
-                int fallBackIndex = Integer.parseInt(file.getName().substring(0, 1));
-                System.out.println("User have requested to fallback to MultiClusterIndex " + fallBackIndex);
-                JedisConnectionManagement.provider.setActiveMultiClusterIndex(fallBackIndex);
+                int activeClusterFailBackIndex = Integer.parseInt(file.getName().substring(0, 1));
+                System.out.println("User have requested to failback to ActiveMultiClusterIndex=" + activeClusterFailBackIndex);
+                JedisConnectionManagement.provider.setActiveMultiClusterIndex(activeClusterFailBackIndex);
             }
         };
         observer.addListener(listener);

src/main/java/com/redis/benchmark/utils/JedisConnectionManagement.java

@@ -57,16 +57,9 @@ private void createJedisConnection() {
                 multiClusterJedisClientConfig.circuitBreakerSlidingWindowMinCalls(Integer.parseInt(BenchmarkConfiguration.get().getConnectionCircuitBreakerSlidingWindowMinCalls()));
                 multiClusterJedisClientConfig.circuitBreakerFailureRateThreshold(Float.parseFloat(BenchmarkConfiguration.get().getConnectionCircuitBreakerFailureRateThreshold()));
                 provider = new MultiClusterPooledConnectionProvider(multiClusterJedisClientConfig.build());
+                provider.setClusterFailoverPostProcessor(a -> System.out.println("\nActiveMultiClusterIndex=" + a));
 
                 connectionManagement.unifiedJedis = new UnifiedJedis(provider);
-
-                activeMultiClusterIndex = Integer.parseInt(provider.getClusterCircuitBreaker().getName().split(":")[1]);
-                pidPath = System.getProperty("user.dir") + File.separator + "jedisPid" + File.separator;
-                pidFile = pidPath + activeMultiClusterIndex + ".pid";
-
-                PidFile.create(Path.of(pidFile), true, activeMultiClusterIndex);
-
-                FileEventListener.FILE_EVENT_LISTENER.start(pidPath, 1000);
             }
         } catch (Exception e) {
             System.err.println("------------------- Failed UnifiedJedis " + e.getMessage());
@@ -77,6 +70,17 @@ public static JedisCommands getCommands() {
         if (!connectionCreated) {
             connectionManagement.createJedisConnection();
             connectionCreated = Boolean.TRUE;
+
+            activeMultiClusterIndex = Integer.parseInt(provider.getClusterCircuitBreaker().getName().split(":")[1]);
+            pidPath = System.getProperty("user.dir") + File.separator + "jedisPid" + File.separator;
+            pidFile = pidPath + activeMultiClusterIndex + ".pid";
+
+            try {
+                PidFile.create(Path.of(pidFile), true, activeMultiClusterIndex);
+                FileEventListener.FILE_EVENT_LISTENER.start(pidPath, 1000);
+            } catch (Exception e) {
+                System.err.println("------------------- Failed " + e.getMessage());
+            }
         }
         return connectionManagement.unifiedJedis;
     }