[18.03] backport reaper fixes#2694
Merged
Merged
Conversation
…he desired state on tasks to revent reconciliation races. Signed-off-by: Anshul Pundir <anshul.pundir@docker.com> (cherry picked from commit a388cad) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…tor/taskreaper Signed-off-by: Anshul Pundir <anshul.pundir@docker.com> (cherry picked from commit 8cfb337) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
… service has been deleted. Signed-off-by: Anshul Pundir <anshul.pundir@docker.com> (cherry picked from commit 592e8ed) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…the end of tick() Signed-off-by: Anshul Pundir <anshul.pundir@docker.com> (cherry picked from commit 1a43a3b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The batching logic of the task reaper was previously race-y because of its use of timer.Reset. This fixes the logic to guarantee it's not race-y. Signed-off-by: Drew Erny <drew.erny@docker.com> (cherry picked from commit 5291c7a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
This supersedes #2668 ping @anshulpundir @dperny @cyli PTAL if this LGTY |
Codecov Report
@@ Coverage Diff @@
## bump_v18.03 #2694 +/- ##
===============================================
+ Coverage 61.6% 61.94% +0.33%
===============================================
Files 134 134
Lines 21795 21816 +21
===============================================
+ Hits 13426 13513 +87
+ Misses 6929 6858 -71
- Partials 1440 1445 +5 |
cyli
approved these changes
Jul 9, 2018
Contributor
cyli
left a comment
There was a problem hiding this comment.
LGTM, thanks for backporting @thaJeztah
Collaborator
|
LGTM, let's do it. |
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
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.
Backports for 18.03 of;
Conflict when cherry-picking 8cfb337, likely because things were cherry-picked out of order;
Resolved by
git rm manager/orchestrator/replicated/task_reaper_test.goto mark resolutionTo verify everything looked ok after merging, I compared the directories with master;
Which produced an empty diff, so the
master/orchestratordirectory is fully up to date with master