Skip to content

[18.03] backport reaper fixes#2694

Merged
dperny merged 5 commits into
moby:bump_v18.03from
thaJeztah:18.03-backport_reaper_2
Jul 9, 2018
Merged

[18.03] backport reaper fixes#2694
dperny merged 5 commits into
moby:bump_v18.03from
thaJeztah:18.03-backport_reaper_2

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backports for 18.03 of;

git cherry-pick -s -S -x a388cad309edddb9880899fe8927afbe4717a18e
git cherry-pick -s -S -x 8cfb337920a6658b302643f27074ca3d669176ec
git cherry-pick -s -S -x 592e8eddfa43ec5fbd6e34da5ad6890dfa9313fb
git cherry-pick -s -S -x 1a43a3b612d8c775db8a44c8399844e1f7e4aed2
git cherry-pick -s -S -x 5291c7a7b45773a4fe18720a54485ee2dde0af3d

Conflict when cherry-picking 8cfb337, likely because things were cherry-picked out of order;

On branch 18.03-backport_reaper_2
You are currently cherry-picking commit 8cfb3379.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   manager/orchestrator/taskreaper/task_reaper_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by them: manager/orchestrator/replicated/task_reaper_test.go

Resolved by git rm manager/orchestrator/replicated/task_reaper_test.go to mark resolution

To verify everything looked ok after merging, I compared the directories with master;

git diff master  manager/orchestrator/taskreaper/ 
git diff master  manager/orchestrator/

Which produced an empty diff, so the master/orchestrator directory is fully up to date with master

anshulpundir and others added 5 commits July 8, 2018 00:51
…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>
@thaJeztah
Copy link
Copy Markdown
Member Author

This supersedes #2668

ping @anshulpundir @dperny @cyli PTAL if this LGTY

@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 7, 2018

Codecov Report

Merging #2694 into bump_v18.03 will increase coverage by 0.33%.
The diff coverage is 82.6%.

@@               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

Copy link
Copy Markdown
Contributor

@cyli cyli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for backporting @thaJeztah

@dperny
Copy link
Copy Markdown
Collaborator

dperny commented Jul 9, 2018

LGTM, let's do it.

@dperny dperny merged commit c8121bc into moby:bump_v18.03 Jul 9, 2018
@thaJeztah thaJeztah deleted the 18.03-backport_reaper_2 branch July 9, 2018 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants