Skip to content

Commit 4230a47

Browse files
authored
[automatic failover] Address review comments (#4264)
Address review comments - replace magic numbers in tests with constats
1 parent a30f642 commit 4230a47

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import static org.hamcrest.core.IsEqual.equalTo;
4343
import static org.junit.jupiter.api.Assertions.assertThrows;
4444

45-
// TODO: Dynamic port for proxy
4645
@Tag("failover")
4746
public class FailoverIntegrationTest {
4847

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class ActiveActiveLocalFailoverTest {
4949
private static final EndpointConfig endpoint1 = HostAndPorts.getRedisEndpoint("redis-failover-1");
5050
private static final EndpointConfig endpoint2 = HostAndPorts.getRedisEndpoint("redis-failover-2");
5151
private static final ToxiproxyClient tp = new ToxiproxyClient("localhost", 8474);
52-
public static final int ENDPOINT_PAUSE_TIME = 10000;
52+
public static final int ENDPOINT_PAUSE_TIME_MS = 10000;
5353
private static Proxy redisProxy1;
5454
private static Proxy redisProxy2;
5555

@@ -270,7 +270,7 @@ public void accept(ClusterSwitchEventArgs e) {
270270
log.info("Triggering issue on endpoint1");
271271
try (Jedis jedis = new Jedis(endpoint1.getHostAndPort(),
272272
endpoint1.getClientConfigBuilder().build())) {
273-
jedis.clientPause(ENDPOINT_PAUSE_TIME);
273+
jedis.clientPause(ENDPOINT_PAUSE_TIME_MS);
274274
}
275275

276276
fakeApp.setAction(new TriggerActionResponse(null) {
@@ -324,7 +324,7 @@ public boolean isCompleted(Duration checkInterval, Duration delayAfter, Duration
324324
}
325325

326326
private static void ensureEndpointAvailability(HostAndPort endpoint, JedisClientConfig config) {
327-
await().atMost(Duration.ofSeconds(ENDPOINT_PAUSE_TIME)).until(() -> {
327+
await().atMost(Duration.ofSeconds(ENDPOINT_PAUSE_TIME_MS)).until(() -> {
328328
try (Jedis jedis = new Jedis(endpoint, config)) {
329329
return "PONG".equals(jedis.ping());
330330
} catch (Exception e) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@ public void commandFailoverUnresolvableHost() {
146146
public void commandFailover() {
147147
int slidingWindowMinCalls = 6;
148148
int slidingWindowSize = 6;
149+
int retryMaxAttempts = 3;
149150

150151
MultiClusterClientConfig.Builder builder = new MultiClusterClientConfig.Builder(
151152
getClusterConfigs(clientConfig, hostPortWithFailure, workingEndpoint.getHostAndPort()))
152-
.retryMaxAttempts(3) // Default
153+
.retryMaxAttempts(retryMaxAttempts) // Default
153154
// is
154155
// 3
155156
.circuitBreakerSlidingWindowMinCalls(slidingWindowMinCalls)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Tags({ @Tag("failover"), @Tag("scenario") })
3636
public class ActiveActiveFailoverTest {
3737
private static final Logger log = LoggerFactory.getLogger(ActiveActiveFailoverTest.class);
38-
private static final int NUM_OF_THREADS = 18; //18;
38+
private static final int NUM_OF_THREADS = 18;
3939
private static final int SOCKET_TIMEOUT_MS = DEFAULT_TIMEOUT;
4040
private static final int CONNECTION_TIMEOUT_MS = DEFAULT_TIMEOUT;
4141
private static final long NETWORK_FAILURE_INTERVAL = 15L;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public class FaultInjectionClient {
2424

2525
private static final String BASE_URL;
2626

27+
static final int CONNECTION_REQUEST_TIMEOUT = 3000;
28+
static final int RESPONSE_TIMEOUT = 3000;
29+
2730
static {
2831
BASE_URL = System.getenv().getOrDefault("FAULT_INJECTION_API_URL", "http://127.0.0.1:20324");
2932
}
@@ -91,8 +94,8 @@ public boolean isCompleted(Duration checkInterval, Duration delayAfter, Duration
9194

9295
private static CloseableHttpClient getHttpClient() {
9396
RequestConfig requestConfig = RequestConfig.custom()
94-
.setConnectionRequestTimeout(3000, TimeUnit.MILLISECONDS)
95-
.setResponseTimeout(3000, TimeUnit.MILLISECONDS).build();
97+
.setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
98+
.setResponseTimeout(RESPONSE_TIMEOUT, TimeUnit.MILLISECONDS).build();
9699

97100
return HttpClientBuilder.create()
98101
.setDefaultRequestConfig(requestConfig).build();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
public class MultiThreadedFakeApp extends FakeApp {
1616

17+
static final int QUEUE_CAPACITY = 100000;
18+
1719
private final ExecutorService executorService;
1820
private final RateLimiter rateLimiter;
1921

@@ -28,7 +30,7 @@ public MultiThreadedFakeApp(UnifiedJedis client, FakeApp.ExecutedAction action,
2830
numThreads,
2931
0L,
3032
TimeUnit.MILLISECONDS,
31-
new LinkedBlockingQueue<Runnable>(100000),
33+
new LinkedBlockingQueue<Runnable>(QUEUE_CAPACITY),
3234
new ThreadPoolExecutor.CallerRunsPolicy()
3335
);
3436
if (config != null) {

0 commit comments

Comments
 (0)