Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 10:17:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extend lifecycle of Redis cluster clients

Browse Source
This commit is contained in:
Jon Chambers
2025-07-16 17:36:01 -04:00
committed by Jon Chambers
parent 803e73bd1e
commit 85a13a9dc0
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/test/java/org/whispersystems/textsecuregcm/configuration/LocalFaultTolerantRedisClusterFactory.java
View File

@@ -33,7 +33,6 @@ public class LocalFaultTolerantRedisClusterFactory implements FaultTolerantRedis
if (shutdownHookConfigured.compareAndSet(false, true)) {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
try {
redisClusterExtension.afterEach(null);
redisClusterExtension.close();
} catch (Throwable e) {
throw new RuntimeException(e);

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

@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -32,8 +31,7 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
import org.whispersystems.textsecuregcm.configuration.RetryConfiguration;
public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback,
ExtensionContext.Store.CloseableResource {
public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallback, ExtensionContext.Store.CloseableResource {
private static ComposeContainer composeContainer;
private static ClientResources redisClientResources;
@@ -68,16 +66,12 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
if (redisClientResources != null) {
redisClientResources.shutdown().get();
composeContainer.stop();
redisClusterClient.shutdown();
}
redisClientResources = null;
}
@Override
public void afterEach(final ExtensionContext context) {
redisClusterClient.shutdown();
}
@Override
public void beforeAll(final ExtensionContext context) throws Exception {
if (redisClientResources == null) {
@@ -149,20 +143,21 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
Thread.sleep(100);
}
} while (!allNodesUp);
final CircuitBreakerConfiguration circuitBreakerConfig = new CircuitBreakerConfiguration();
circuitBreakerConfig.setWaitDurationInOpenState(Duration.ofMillis(500));
redisClusterClient = new FaultTolerantRedisClusterClient("test-cluster",
redisClientResources.mutate(),
getRedisURIs(),
timeout,
circuitBreakerConfig,
retryConfiguration);
}
}
@Override
public void beforeEach(final ExtensionContext context) throws Exception {
final CircuitBreakerConfiguration circuitBreakerConfig = new CircuitBreakerConfiguration();
circuitBreakerConfig.setWaitDurationInOpenState(Duration.ofMillis(500));
redisClusterClient = new FaultTolerantRedisClusterClient("test-cluster",
redisClientResources.mutate(),
getRedisURIs(),
timeout,
circuitBreakerConfig,
retryConfiguration);
redisClusterClient.useCluster(connection -> connection.sync().flushall(FlushMode.SYNC));
}