Fix Unlock handling for kvstore locks #9973
Merged
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
aanm
added
kind/bug
|
test-me-please |
tgraf
requested changes
Jan 27, 2020
pkg/allocator/allocator.go
Outdated
| @@ -443,7 +443,7 @@ func (a *Allocator) lockedAllocate(ctx context.Context, key AllocatorKey) (idpoo | |||
| return 0, false, err | |||
| } | |||
|
|
|||
| defer lock.Unlock(ctx) | |||
| defer lock.Unlock(context.TODO()) | |||
There was a problem hiding this comment.
I think we want Background() as this is not a context that has yet to be defined but it's a context that should never expire.
There was a problem hiding this comment.
ah that's a good point. Fixed
aanm
force-pushed
the
pr/fix-kvstore-lock-master
branch
from
ee53547
to
886a28c
Compare
|
test-me-please |
|
test-me-please |
Using the same context used to lock a key is not the right functionality that we want as it can cause distributed locking issues. For example, in case a client gets a distributed key and the context is canceled while that lock is being held, the Unlock() functions will not execute since that same context was canceled leaving the distributed lock locked until the client disconnects from the kvstore. Fixes: d3ad5c7 ("kvstore: plumb context") Fixes: 157089d ("allocator: add context to `RunGC`") Signed-off-by: André Martins <andre@cilium.io>
Earlier returning from the function stating the lock was acquired it might make the caller of waitForInitLock to cancel the context to earlier which makes the Unlock operation to fail. Althought this context bug was fixed by "pkg/kvstore: use different context for lock and unlock" the right behavior of this function should be to return successfully after the Unlock was performed. Signed-off-by: André Martins <andre@cilium.io>
aanm
force-pushed
the
pr/fix-kvstore-lock-master
branch
from
886a28c
to
1c2a453
Compare
|
test-me-please |
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.
This PR fixes a couple bugs encountered in master with regarding the handling of unlock function. Please read per commit for more info.
Does not f i x: #9855
This change is