RedisLock: Throw exception from unlock on expire #2661
Merged
Conversation
This file contains hidden or 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
The lock might be expired in target Redis store in between `lock()` and `unlock()`. So, throw an `IllegalStateException` when lock is expired during unlocking. At the same time the lock lock is unlocked anyway. **Cherry-pick to 5.0.x**
garyrussell
suggested changes
Dec 14, 2018
| waitForExpire("foo"); | ||
| lock1.unlock(); | ||
| assertTrue(lock2.tryLock()); | ||
| assertFalse(lock1.tryLock()); |
There was a problem hiding this comment.
These two are redundant now - shouldn't the test for the new logic be in a different test?
| @@ -301,6 +305,10 @@ public void unlock() { | |||
| return; | |||
| } | |||
| try { | |||
| if (!isAcquiredInThisProcess()) { | |||
| throw new IllegalStateException("Lock was released in the store due to expiration."); | |||
There was a problem hiding this comment.
Perhaps we should be more explicit? ...due to expiration. The integrity of data protected by this lock may have been compromised. ?
* Add more info into the exception
garyrussell
approved these changes
Dec 14, 2018
garyrussell
pushed a commit
that referenced
this pull request
Dec 14, 2018
* RedisLock: Throw exception from unlock on expire The lock might be expired in target Redis store in between `lock()` and `unlock()`. So, throw an `IllegalStateException` when lock is expired during unlocking. At the same time the lock lock is unlocked anyway. **Cherry-pick to 5.0.x** * * Create a new test for exception * Add more info into the exception
|
Cherry-picked as 0199741 |
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.
The lock might be expired in target Redis store in between
lock()andunlock().So, throw an
IllegalStateExceptionwhen lock is expired duringunlocking.
At the same time the lock lock is unlocked anyway.
Cherry-pick to 5.0.x