Skip to content

Commit ef859fd

Browse files
0.10.7: readiness redis probe works with sentinel/cluster (use bucket.isExists, not getRedisNodes)
1 parent c3f14bb commit ef859fd

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
}
2525

2626
allprojects {
27-
project.version = '0.10.6'
27+
project.version = '0.10.7'
2828
}
2929

3030
subprojects {

spellsource-server/src/main/java/com/hiddenswitch/framework/Diagnostics.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
import io.vertx.pgclient.PgBuilder;
1616
import io.vertx.sqlclient.Pool;
1717
import io.vertx.sqlclient.PoolOptions;
18-
import org.redisson.api.redisnode.RedisNodes;
1918
import org.slf4j.Logger;
2019
import org.slf4j.LoggerFactory;
2120

22-
import java.util.concurrent.TimeUnit;
23-
2421
public class Diagnostics {
2522
private final static Logger LOGGER = LoggerFactory.getLogger(Diagnostics.class);
2623
private final static Multiset<String> MESSAGES = ConcurrentHashMultiset.create();
@@ -50,7 +47,10 @@ public static Future<Void> routes(Vertx vertx) {
5047
var client = new Client(vertx);
5148

5249
var protos = client.unauthenticated().getConfiguration(Empty.getDefaultInstance()).eventually(client::closeFut);
53-
var redis = Future.fromCompletionStage(Environment.redisson().getRedisNodes(RedisNodes.SINGLE).getInstance().pingAsync(200, TimeUnit.MILLISECONDS));
50+
// Works for single-server, sentinel, cluster, and replication — issues a lightweight
51+
// EXISTS against an arbitrary key. Avoids Redisson.getRedisNodes() which is typed per
52+
// topology and throws on the wrong configuration.
53+
var redis = Future.fromCompletionStage(Environment.redisson().getBucket("_healthz").isExistsAsync().toCompletableFuture());
5454
var pgConnectOptions = Environment.pgArgs().connectionOptions();
5555
var pgClient = PgBuilder.pool().using(vertx).connectingTo(pgConnectOptions).with(new PoolOptions()).build();
5656
var postgres = pgClient.query("""

0 commit comments

Comments
 (0)