Skip to content

Commit 9e2b589

Browse files
committed
JVMCBC-1699 launchSeedNodeResolver logs scary warning
Modifications ------------- Don't retry publishing seed nodes if the cluster shuts down before the seed nodes are resolved. Change-Id: I01bdddec5b2979ef6a9637f09f750f2ed51cba7b Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/235241 Reviewed-by: Michael Reiche <[email protected]> Tested-by: Build Bot <[email protected]> (cherry picked from commit f02e126) Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/235257 Reviewed-by: David Nault <[email protected]>
1 parent f2ea5e3 commit 9e2b589

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

core-io/src/main/java/com/couchbase/client/core/Reactor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ public static <T> Flux<T> shieldFromCancellation(Flux<T> flux) {
285285
});
286286
}
287287

288-
private static Sinks.EmitResult ignoreIfDone(Sinks.EmitResult result) {
288+
@Stability.Internal
289+
public static Sinks.EmitResult ignoreIfDone(Sinks.EmitResult result) {
289290
return result == FAIL_TERMINATED || result == FAIL_CANCELLED
290291
? OK
291292
: result;

core-io/src/main/java/com/couchbase/client/core/config/DefaultConfigurationProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
import java.util.stream.Collectors;
9898

9999
import static com.couchbase.client.core.Reactor.emitFailureHandler;
100+
import static com.couchbase.client.core.Reactor.ignoreIfDone;
100101
import static com.couchbase.client.core.logging.RedactableArgument.redactMeta;
101102
import static com.couchbase.client.core.logging.RedactableArgument.redactSystem;
102103
import static com.couchbase.client.core.util.ConnectionStringUtil.fromDnsSrvOrThrowIfTlsRequired;
@@ -230,7 +231,7 @@ private Disposable launchSeedNodeResolver(ConnectionString connectionString, Cor
230231
env.eventBus()
231232
);
232233
topologyParser = createTopologyParser(core.environment(), seedNodes);
233-
setSeedNodes(seedNodes).orThrow();
234+
ignoreIfDone(setSeedNodes(seedNodes)).orThrow();
234235
log.info("Resolved seed nodes: {}", redactSystem(seedNodes));
235236
})
236237
.subscribeOn(Schedulers.boundedElastic()) // DNS SRV lookup blocks

0 commit comments

Comments
 (0)