orchestrator/global: Fix deadlock on updates #1760
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
The updater is wrongly called from inside a store transaction, which can lead to a deadlock if an update is already running. The new update tries to cancel the running one, but that existing update may be stuck trying to start a store transaction and therefore the new update waits forever for it to stop. To fix this, keep track of tasks that need to be updated, and call the updater outside the transaction. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
|
LGTM |
Current coverage is 55.35% (diff: 25.00%)@@ master #1760 diff @@
==========================================
Files 102 101 -1
Lines 16729 16503 -226
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
- Hits 9210 9135 -75
+ Misses 6378 6239 -139
+ Partials 1141 1129 -12
|
|
LGTM |
|
Also cherry-picked to bump_v1.12.4 branch |
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 updater is wrongly called from inside a store transaction, which can
lead to a deadlock if an update is already running. The new update tries
to cancel the running one, but that existing update may be stuck trying
to start a store transaction and therefore the new update waits forever
for it to stop. To fix this, keep track of tasks that need to be
updated, and call the updater outside the transaction.
See moby/moby#28039
cc @dongluochen @aluzzardi