[automatic failover] Address review comments (#4264)

Address review comments

  - replace magic numbers in tests with constats

Author: ggivo

src/test/java/redis/clients/jedis/failover/FailoverIntegrationTest.java

@@ -42,7 +42,6 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-// TODO: Dynamic port for proxy
 @Tag("failover")
 public class FailoverIntegrationTest {
 

src/test/java/redis/clients/jedis/mcf/ActiveActiveLocalFailoverTest.java

@@ -49,7 +49,7 @@ public class ActiveActiveLocalFailoverTest {
   private static final EndpointConfig endpoint1 = HostAndPorts.getRedisEndpoint("redis-failover-1");
   private static final EndpointConfig endpoint2 = HostAndPorts.getRedisEndpoint("redis-failover-2");
   private static final ToxiproxyClient tp = new ToxiproxyClient("localhost", 8474);
-  public static final int ENDPOINT_PAUSE_TIME = 10000;
+  public static final int ENDPOINT_PAUSE_TIME_MS = 10000;
   private static Proxy redisProxy1;
   private static Proxy redisProxy2;
 
@@ -270,7 +270,7 @@ public void accept(ClusterSwitchEventArgs e) {
     log.info("Triggering issue on endpoint1");
     try (Jedis jedis = new Jedis(endpoint1.getHostAndPort(),
         endpoint1.getClientConfigBuilder().build())) {
-      jedis.clientPause(ENDPOINT_PAUSE_TIME);
+      jedis.clientPause(ENDPOINT_PAUSE_TIME_MS);
     }
 
     fakeApp.setAction(new TriggerActionResponse(null) {
@@ -324,7 +324,7 @@ public boolean isCompleted(Duration checkInterval, Duration delayAfter, Duration
   }
 
   private static void ensureEndpointAvailability(HostAndPort endpoint, JedisClientConfig config) {
-    await().atMost(Duration.ofSeconds(ENDPOINT_PAUSE_TIME)).until(() -> {
+    await().atMost(Duration.ofSeconds(ENDPOINT_PAUSE_TIME_MS)).until(() -> {
       try (Jedis jedis = new Jedis(endpoint, config)) {
         return "PONG".equals(jedis.ping());
       } catch (Exception e) {

src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java

@@ -146,10 +146,11 @@ public void commandFailoverUnresolvableHost() {
   public void commandFailover() {
     int slidingWindowMinCalls = 6;
     int slidingWindowSize = 6;
+    int retryMaxAttempts = 3;
 
     MultiClusterClientConfig.Builder builder = new MultiClusterClientConfig.Builder(
         getClusterConfigs(clientConfig, hostPortWithFailure, workingEndpoint.getHostAndPort()))
-            .retryMaxAttempts(3) // Default
+            .retryMaxAttempts(retryMaxAttempts) // Default
                                  // is
                                  // 3
             .circuitBreakerSlidingWindowMinCalls(slidingWindowMinCalls)

src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java

@@ -35,7 +35,7 @@
 @Tags({ @Tag("failover"), @Tag("scenario") })
 public class ActiveActiveFailoverTest {
   private static final Logger log = LoggerFactory.getLogger(ActiveActiveFailoverTest.class);
-  private static final int NUM_OF_THREADS = 18; //18;
+  private static final int NUM_OF_THREADS = 18;
   private static final int SOCKET_TIMEOUT_MS = DEFAULT_TIMEOUT;
   private static final int CONNECTION_TIMEOUT_MS = DEFAULT_TIMEOUT;
   private static final long NETWORK_FAILURE_INTERVAL = 15L;

src/test/java/redis/clients/jedis/scenario/FaultInjectionClient.java

@@ -24,6 +24,9 @@ public class FaultInjectionClient {
 
   private static final String BASE_URL;
 
+  static final int CONNECTION_REQUEST_TIMEOUT = 3000;
+  static final int RESPONSE_TIMEOUT = 3000;
+
   static {
     BASE_URL = System.getenv().getOrDefault("FAULT_INJECTION_API_URL", "http://127.0.0.1:20324");
   }
@@ -91,8 +94,8 @@ public boolean isCompleted(Duration checkInterval, Duration delayAfter, Duration
 
   private static CloseableHttpClient getHttpClient() {
     RequestConfig requestConfig = RequestConfig.custom()
-        .setConnectionRequestTimeout(3000, TimeUnit.MILLISECONDS)
-        .setResponseTimeout(3000, TimeUnit.MILLISECONDS).build();
+        .setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+        .setResponseTimeout(RESPONSE_TIMEOUT, TimeUnit.MILLISECONDS).build();
 
     return HttpClientBuilder.create()
         .setDefaultRequestConfig(requestConfig).build();

src/test/java/redis/clients/jedis/scenario/MultiThreadedFakeApp.java

@@ -14,6 +14,8 @@
 
 public class MultiThreadedFakeApp extends FakeApp {
 
+  static final int QUEUE_CAPACITY = 100000;
+
   private final ExecutorService executorService;
   private final RateLimiter rateLimiter;
 
@@ -28,7 +30,7 @@ public MultiThreadedFakeApp(UnifiedJedis client, FakeApp.ExecutedAction action,
         numThreads,
         0L,
         TimeUnit.MILLISECONDS,
-        new LinkedBlockingQueue<Runnable>(100000),
+        new LinkedBlockingQueue<Runnable>(QUEUE_CAPACITY),
         new ThreadPoolExecutor.CallerRunsPolicy()
     );
     if (config != null) {