Skip to content

fix(retry): make RetryLogic executor threads daemon #1660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

fix(retry): make RetryLogic executor threads daemon #1660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -112,7 +113,7 @@ public final Driver newInstance(
Supplier<Rediscovery> rediscoverySupplier) {
requireNonNull(authTokenManager, "authTokenProvider must not be null");

var retryExecutor = eventLoopGroup != null ? eventLoopGroup : Executors.newSingleThreadScheduledExecutor();
var retryExecutor = eventLoopGroup != null ? eventLoopGroup : retryScheduledExecutorService();
var retryLogic = createRetryLogic(config.maxTransactionRetryTimeMillis(), retryExecutor, config.logging());

var metricsProvider = getOrCreateMetricsProvider(config, createClock());
Expand All @@ -128,6 +129,16 @@ public final Driver newInstance(
rediscoverySupplier);
}

private static ScheduledExecutorService retryScheduledExecutorService() {
var nextId = new AtomicInteger(1);
return Executors.newSingleThreadScheduledExecutor(runnable -> {
var thread = new Thread(runnable);
thread.setName("neo4jdriverretry-" + nextId.getAndIncrement());
thread.setDaemon(true);
return thread;
});
}

protected static MetricsProvider getOrCreateMetricsProvider(Config config, Clock clock) {
var metricsAdapter = config.metricsAdapter();
// This can actually only happen when someone mocks the config
Expand Down