Explicitly use synchronous flush mode when clearing Redis databases between tests

This commit is contained in:
Jon Chambers 2025-07-03 11:33:00 -04:00 committed by ravi-signal
parent 3e80669f4e
commit 0745cabc87
2 changed files with 4 additions and 2 deletions

View File

@ -8,6 +8,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.github.resilience4j.circuitbreaker.CallNotPermittedException;
import io.lettuce.core.FlushMode;
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;
@ -126,7 +127,7 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
} }
}); });
redisCluster.useCluster(connection -> connection.sync().flushall()); redisCluster.useCluster(connection -> connection.sync().flushall(FlushMode.SYNC));
} }
public static List<RedisURI> getRedisURIs() { public static List<RedisURI> getRedisURIs() {

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.lettuce.core.FlushMode;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
import io.lettuce.core.resource.ClientResources; import io.lettuce.core.resource.ClientResources;
import java.io.IOException; import java.io.IOException;
@ -74,7 +75,7 @@ public class RedisServerExtension implements BeforeAllCallback, BeforeEachCallba
circuitBreakerConfig, circuitBreakerConfig,
new RetryConfiguration()); new RetryConfiguration());
faultTolerantRedisClient.useConnection(connection -> connection.sync().flushall()); faultTolerantRedisClient.useConnection(connection -> connection.sync().flushall(FlushMode.SYNC));
} }
@Override @Override