GH-9291: Enhanced unlock() method of JdbcLock to verify successful unlocking #9292
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
artembilan
requested changes
Jul 1, 2024
...integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java
Show resolved
Hide resolved
...tegration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
Outdated
Show resolved
Hide resolved
| @@ -24,8 +24,6 @@ | |||
|
|
|||
| <bean id="lockClient" class="org.springframework.integration.jdbc.lock.DefaultLockRepository"> | |||
| <constructor-arg name="dataSource" ref="dataSource"/> | |||
| <property name="insertQuery" | |||
| value="INSERT INTO INT_LOCK (REGION, LOCK_KEY, CLIENT_ID, CREATED_DATE) VALUES (?, ?, ?, ?)"/> | |||
There was a problem hiding this comment.
There was a reason to have this in the test: #3866.
Even if it is the same value we have by default, it still covers a respective setter call.
So, please, consider to revert your change.
It is still not relevant to the purpose of this PR.
...tion-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java
Outdated
Show resolved
Hide resolved
...tion-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java
Outdated
Show resolved
Hide resolved
...ration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
Show resolved
Hide resolved
artembilan
requested changes
Jul 2, 2024
...tegration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
Outdated
Show resolved
Hide resolved
...integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/LockRepository.java
Show resolved
Hide resolved
…y successful unlocking Fixes: spring-projects#9291 * Modify `unlock()` method of `JdbcLock`: if the lock ownership can not be removed due to data expiration, a `ConcurrentModificationException` should be thrown. * Modify `unlock()` method of `RedisLock`: if the lock ownership can not be removed due to data expiration, a `ConcurrentModificationException` should be thrown. * Maintain test cases
artembilan
requested changes
Jul 2, 2024
src/reference/antora/modules/ROOT/pages/jdbc/lock-registry.adoc
Outdated
Show resolved
Hide resolved
|
Thank you for your feedback and the good reference! I've just pushed another commit. |
|
thank you for contribution; looking forward for more! I know, we have with you a |
|
Here is a Migration Guide page we have talked about before: https://github.com/spring-projects/spring-integration/wiki/Spring-Integration-6.3-to-6.4-Migration-Guide |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #9291
unlock()method ofJdbcLock: if the lock ownership can not be removed due to data expiration, aConcurrentModificationExceptionshould be thrown.unlock()method ofRedisLock: if the lock ownership can not be removed due to data expiration, aConcurrentModificationExceptionshould be thrown.