Skip to content

Make RedisLockRegistry work again for both Redis Cluster and AWS Elastic Valkey Cluster #10557

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 3 commits into from
Nov 10, 2025
+27 −4
Merged

Make RedisLockRegistry work again for both Redis Cluster and AWS Elastic Valkey Cluster #10557

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6044a8c
pass unLockChannelKey as `ARGV[2]` instead of `KEYS[2]` to make this …
kistlers Nov 6, 2025
508d73f
add documentation for AWS ElastiCache Valkey Support in RedisLockRegi…
kistlers Nov 7, 2025
4e3aeae
redis valkey cluster docs PR fixes
kistlers Nov 8, 2025
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
6 changes: 3 additions & 3 deletions ...ion-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ private final class RedisPubSubLock extends RedisLock {
private static final String UNLINK_UNLOCK_SCRIPT = """
local lockClientId = redis.call('GET', KEYS[1])
if (lockClientId == ARGV[1] and redis.call('UNLINK', KEYS[1]) == 1) then
redis.call('PUBLISH', KEYS[2], KEYS[1])
redis.call('PUBLISH', ARGV[2], KEYS[1])
return true
end
return false
Expand All @@ -693,8 +693,8 @@ protected boolean tryRedisLockInner(long time, long expireAfter)
protected boolean removeLockKeyInnerUnlink() {
final String unLockChannelKey = RedisLockRegistry.this.unLockChannelKey + ":" + this.lockKey;
return Boolean.TRUE.equals(RedisLockRegistry.this.redisTemplate.execute(
UNLINK_UNLOCK_REDIS_SCRIPT, List.of(this.lockKey, unLockChannelKey),
RedisLockRegistry.this.clientId));
UNLINK_UNLOCK_REDIS_SCRIPT, List.of(this.lockKey),
RedisLockRegistry.this.clientId, unLockChannelKey));
}

private boolean subscribeLock(long time, long expireAfter) throws ExecutionException, InterruptedException {
Expand Down