Skip to content

Optimization: Change clean-up of pooled connections to be conditional #46

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

Open
jduo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Optimization: Change clean-up of pooled connections to be conditional #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52d927e
Optimization: Change clean-up of pooled connections to be conditional
jduo Jan 14, 2026
123d52f
Revert marking of the ValkeyGlideConnection as not closed
jduo Jan 14, 2026
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
31 changes: 13 additions & 18 deletions ...lkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideClusterConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,30 +113,25 @@ public ClusterGlideClientAdapter getClusterAdapter() {
*/
@Override
protected void cleanupConnectionState() {
// Dont use RESET - we will destroy the configured state
// Use valkey-glide native pipe to selectively clear the state on the backends,
// adapter and connection object do not matter - they are being destroyed
// some state cannot be cleared (like stats) but this is acceptable if pooling to be used

GlideClusterClient nativeClient = (GlideClusterClient) unifiedClient.getNativeClient();

@SuppressWarnings("unchecked")
Callable<Void>[] actions = new Callable[] {
() -> nativeClient.customCommand(new String[]{"UNWATCH"}, SimpleMultiNodeRoute.ALL_NODES).get(),
// TODO: Uncomment when dynamic pubsub is implemented
// () -> nativeClient.customCommand(new String[]{"UNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get(),
// () -> nativeClient.customCommand(new String[]{"PUNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get(),
// () -> nativeClient.customCommand(new String[]{"SUNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get()
};

for (Callable<Void> action : actions) {
// Only send UNWATCH if keys were actually watched
if (!watchedKeys.isEmpty()) {
GlideClusterClient nativeClient = (GlideClusterClient) unifiedClient.getNativeClient();
try {
action.call();
nativeClient.customCommand(new String[]{"UNWATCH"}, SimpleMultiNodeRoute.ALL_NODES).get();
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
} catch (Exception e) {
// Ignore cleanup errors
}
watchedKeys.clear();
}

// TODO: Add similar checks for pubsub when implemented
// if (hasActiveSubscriptions) {
// nativeClient.customCommand(new String[]{"UNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get();
// nativeClient.customCommand(new String[]{"PUNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get();
// nativeClient.customCommand(new String[]{"SUNSUBSCRIBE"}, SimpleMultiNodeRoute.ALL_NODES).get();
// }
}

@Override
Expand Down
33 changes: 14 additions & 19 deletions ...a/io/valkey/springframework/data/valkey/connection/valkeyglide/ValkeyGlideConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class ValkeyGlideConnection extends AbstractValkeyConnection {
private final AtomicBoolean closed = new AtomicBoolean(false);

private final List<ResultMapper<?, ?>> batchCommandsConverters = new ArrayList<>();
private final Set<byte[]> watchedKeys = new HashSet<>();
protected final Set<byte[]> watchedKeys = new HashSet<>();
private @Nullable Subscription subscription;

// Command interfaces
Expand Down Expand Up @@ -202,30 +202,25 @@ public void close() throws DataAccessException {
* This ensures the next connection gets a clean client without stale state.
*/
protected void cleanupConnectionState() {
// Dont use RESET - we will destroy the configured state
// Use valkey-glide native pipe to selectively clear the state on the backends,
// adapter and connection object do not matter - they are being destroyed
// some state cannot be cleared (like stats) but this is acceptable if pooling to be used

GlideClient nativeClient = (GlideClient) unifiedClient.getNativeClient();

@SuppressWarnings("unchecked")
Callable<Void>[] actions = new Callable[] {
() -> nativeClient.customCommand(new String[]{"UNWATCH"}).get(),
// TODO: Uncomment when dynamic pubsub is implemented
// () -> nativeClient.customCommand(new String[]{"UNSUBSCRIBE"}).get(),
// () -> nativeClient.customCommand(new String[]{"PUNSUBSCRIBE"}).get(),
// () -> nativeClient.customCommand(new String[]{"SUNSUBSCRIBE"}).get()
};

for (Callable<Void> action : actions) {
// Only send UNWATCH if keys were actually watched
if (!watchedKeys.isEmpty()) {
GlideClient nativeClient = (GlideClient) unifiedClient.getNativeClient();
try {
action.call();
nativeClient.customCommand(new String[]{"UNWATCH"}).get();
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
} catch (Exception e) {
// Ignore cleanup errors
}
watchedKeys.clear();
}

// TODO: Add similar checks for pubsub when implemented
// if (hasActiveSubscriptions) {
// nativeClient.customCommand(new String[]{"UNSUBSCRIBE"}).get();
// nativeClient.customCommand(new String[]{"PUNSUBSCRIBE"}).get();
// nativeClient.customCommand(new String[]{"SUNSUBSCRIBE"}).get();
// }
}

@Override
Expand Down