GH-8730: Fix isAcquiredInThisProcess to use localLock

The `ExpirableLockRegistry.expireUnusedOlderThan()` uses a query to the target store by mistake.
The logic of this API is indeed about the local cache for those lock instances.
We cannot effect any other processes with this cache.
And even if we remove our local instance while it is locked in other process,
that doesn't mean that on the next `obtain()` call, when we got a fresh local instance, we will be able to acquire a lock in target store.

* Fix `isAcquiredInThisProcess()` to check only `localLock.isLocked()`

**Cherry-pick to `6.1.x` & `6.0.x`**
# Conflicts:
#	spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
This commit is contained in:
Myeonghyeon-Lee
2023-09-18 23:39:37 +09:00
committed by Artem Bilan
parent d8a4765362
commit e8cf812b31
2 changed files with 5 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2022 the original author or authors.
* Copyright 2016-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@ import org.springframework.util.Assert;
* @author Olivier Hubaut
* @author Fran Aranda
* @author Unseok Kim
* @author Myeonghyeon Lee
*
* @since 4.3
*/
@@ -310,7 +311,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry, RenewableLockReg
}
public boolean isAcquiredInThisProcess() {
return this.mutex.isAcquired(this.path);
return delegate.isLocked();
}
public boolean renew() {

View File

@@ -83,6 +83,7 @@ import org.springframework.util.ReflectionUtils;
* @author Unseok Kim
* @author Anton Gabov
* @author Eddie Cho
* @author Myeonghyeon Lee
*
* @since 4.0
*
@@ -502,8 +503,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
}
public final boolean isAcquiredInThisProcess() {
return RedisLockRegistry.this.clientId.equals(
RedisLockRegistry.this.redisTemplate.boundValueOps(this.lockKey).get());
return this.localLock.isLocked();
}
@Override