MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve test Redis cluster setup and teardown

This commit is contained in:
Chris Eager 2024-04-15 14:14:38 -05:00 committed by Chris Eager
parent 82881c030a
commit 9cad2c6b7d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/redis/LettuceShardCircuitBreaker.java
View File

@ -9,6 +9,7 @@ import com.google.common.annotations.VisibleForTesting;
import io.github.resilience4j.circuitbreaker.CallNotPermittedException; import io.github.resilience4j.circuitbreaker.CallNotPermittedException;
import io.github.resilience4j.circuitbreaker.CircuitBreaker; import io.github.resilience4j.circuitbreaker.CircuitBreaker;
import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig; import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
import io.lettuce.core.RedisNoScriptException;
import io.lettuce.core.protocol.CommandHandler; import io.lettuce.core.protocol.CommandHandler;
import io.lettuce.core.protocol.CompleteableCommand; import io.lettuce.core.protocol.CompleteableCommand;
import io.lettuce.core.protocol.RedisCommand; import io.lettuce.core.protocol.RedisCommand;
@ -112,9 +113,10 @@ public class LettuceShardCircuitBreaker implements NettyCustomizer {
command.onComplete((ignored, throwable) -> { command.onComplete((ignored, throwable) -> {
final long durationNanos = System.nanoTime() - startNanos; final long durationNanos = System.nanoTime() - startNanos;
if (throwable != null) { // RedisNoScriptException doesn’t indicate a fault the breaker can protect
if (throwable != null && !(throwable instanceof RedisNoScriptException)) {
breaker.onError(durationNanos, TimeUnit.NANOSECONDS, throwable); breaker.onError(durationNanos, TimeUnit.NANOSECONDS, throwable);
logger.debug("Command completed with error", throwable); logger.warn("Command completed with error", throwable);
} else { } else {
breaker.onSuccess(durationNanos, TimeUnit.NANOSECONDS); breaker.onSuccess(durationNanos, TimeUnit.NANOSECONDS);
} }

12
service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java
View File

@ -7,6 +7,7 @@ package org.whispersystems.textsecuregcm.redis;
import static org.junit.jupiter.api.Assumptions.assumeFalse; import static org.junit.jupiter.api.Assumptions.assumeFalse;
import io.github.resilience4j.circuitbreaker.CallNotPermittedException;
import io.lettuce.core.RedisClient; import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisException; import io.lettuce.core.RedisException;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
@ -42,6 +43,7 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
private final Duration timeout; private final Duration timeout;
private final RetryConfiguration retryConfiguration; private final RetryConfiguration retryConfiguration;
private FaultTolerantRedisCluster redisCluster; private FaultTolerantRedisCluster redisCluster;
private ClientResources redisClientResources;
public RedisClusterExtension(final Duration timeout, final RetryConfiguration retryConfiguration) { public RedisClusterExtension(final Duration timeout, final RetryConfiguration retryConfiguration) {
this.timeout = timeout; this.timeout = timeout;
@ -63,6 +65,7 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
@Override @Override
public void afterEach(final ExtensionContext context) throws Exception { public void afterEach(final ExtensionContext context) throws Exception {
redisCluster.shutdown(); redisCluster.shutdown();
redisClientResources.shutdown().get();
} }
@Override @Override
@ -81,11 +84,14 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
@Override @Override
public void beforeEach(final ExtensionContext context) throws Exception { public void beforeEach(final ExtensionContext context) throws Exception {
redisClientResources = ClientResources.builder().build();
final CircuitBreakerConfiguration circuitBreakerConfig = new CircuitBreakerConfiguration();
circuitBreakerConfig.setWaitDurationInOpenState(Duration.ofMillis(500));
redisCluster = new ShardFaultTolerantRedisCluster("test-cluster", redisCluster = new ShardFaultTolerantRedisCluster("test-cluster",
ClientResources.builder(), redisClientResources.mutate(),
getRedisURIs(), getRedisURIs(),
timeout, timeout,
new CircuitBreakerConfiguration(), circuitBreakerConfig,
retryConfiguration); retryConfiguration);
redisCluster.useCluster(connection -> { redisCluster.useCluster(connection -> {
@ -104,7 +110,7 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
} }
setAll = true; setAll = true;
} catch (final RedisException ignored) { } catch (final RedisException | CallNotPermittedException ignored) {
// Cluster isn't ready; wait and retry. // Cluster isn't ready; wait and retry.
try { try {
Thread.sleep(500); Thread.sleep(500);