[18.03 backport] Fix update out of sequence #2902
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
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com> (cherry picked from commit 5f167ca) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Drew Erny <drew.erny@docker.com> (cherry picked from commit be26111) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
It is likely that a large portion of test flakiness, especially in CI, comes from the fact that swarmkit components under test are started in goroutines, but those goroutines never have an opportunity to run. This adds code ensuring those goroutines are scheduled and run, which should hopefully solve many inexplicably flaky tests. Additionally, increased test timeouts, to hopefully cover a few more flaky cases. Finally, removed direct use of the atomic package, in favor of less efficient but higher-level mutexes. Signed-off-by: Drew Erny <drew.erny@docker.com> (cherry picked from commit 06a3566) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
ok, this needs some work; possibly related to gRPC versions |
|
reverted #2869 to see if that works; I'll rebase if it goes green, and we can punt on that change |
Codecov Report
@@ Coverage Diff @@
## bump_v18.03 #2902 +/- ##
===============================================
- Coverage 61.63% 61.56% -0.08%
===============================================
Files 134 134
Lines 21805 21809 +4
===============================================
- Hits 13439 13426 -13
- Misses 6918 6935 +17
Partials 1448 1448 |
|
OK, that works; let me remove that backport for now |
A simple but old error has recently become evident. Due to the fact that we read an object and then write it back across the boundaries of a transaction, it is possible for the task object to have changed in between transactions. This would cause the attempt to write out the old task to suffer an "Update out of sequence" error. This fix simply reads the latest version of the task back out within the boundary of a transaction to avoid the race. Signed-off-by: Drew Erny <drew.erny@docker.com> (cherry picked from commit d68ac46) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.03_backport_fix_update_out_of_sequence
branch
from
70e8774
to
5fca4d7
Compare
thaJeztah
changed the title
|
ping @dperny @kolyshkin PTAL |
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.
relates to
Backports of
Minor conflict in imports when cherry-picking #2808 (06a3566) because is not in this branch (which would require updating the gRPC version that's used; see #2827 (comment))