Skip to content

[18.03] Cherry picking scheduler and task reaper fixes, plus allocator logging.#2616

Merged
nishanttotla merged 6 commits into
moby:bump_v18.03from
nishanttotla:18.03-task-state-remove
May 2, 2018
Merged

[18.03] Cherry picking scheduler and task reaper fixes, plus allocator logging.#2616
nishanttotla merged 6 commits into
moby:bump_v18.03from
nishanttotla:18.03-task-state-remove

Conversation

@nishanttotla
Copy link
Copy Markdown
Contributor

@nishanttotla nishanttotla commented May 1, 2018

This PR is a cherry-pick of commits from the following PRs (in order, on top of the bump_v18.03 branch):

In order to fix some test flakiness, I've also cherry-picked

git cherry-pick -s -x e3fcf6d9c553e9c69f83df6c49364eb270e62445
git cherry-pick -s -x 88064b5e2a8ca3431285333b37176a13db357648
git cherry-pick -s -x 7f638251835ccc3d791f128e3dbad76ccb9aaebd
git cherry-pick -s -x bef2bd052936d3aefe36cc7e8f6fefeb593e2531
git cherry-pick -s -x 649826059c3b65f2cc54c88de9e448174dfb15ff

All cherry-picks were clean.

cc @anshulpundir @chungers @rchourasia @andrewhsu

anshulpundir and others added 4 commits May 1, 2018 14:47
… running.

Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit e3fcf6d)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
…n assigned but have been marked for shutdown.

Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit 88064b5)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
…assigned

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 7f63825)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit bef2bd0)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
nishanttotla and others added 2 commits May 2, 2018 10:53
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
…ager), it may take

a little while for the dispatcher to come up, so poll until it's up.

In the second case (TestManagerLockUnlock), we wait for the TLS key bytes to change to
test to see whether it has been decrypted after disabling the unlock key.  However, it
could have changed due to a renewal due to the previous unlock key rotation.  So when
polling, check that it's decrypted.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 6498260)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented May 2, 2018

Codecov Report

Merging #2616 into bump_v18.03 will increase coverage by 0.32%.
The diff coverage is 59.37%.

@@               Coverage Diff               @@
##           bump_v18.03    #2616      +/-   ##
===============================================
+ Coverage        61.42%   61.75%   +0.32%     
===============================================
  Files              133      133              
  Lines            21726    21746      +20     
===============================================
+ Hits             13345    13429      +84     
+ Misses            6943     6879      -64     
  Partials          1438     1438

@nishanttotla nishanttotla merged commit 6b92e84 into moby:bump_v18.03 May 2, 2018
@nishanttotla nishanttotla deleted the 18.03-task-state-remove branch May 2, 2018 18:37
@nishanttotla nishanttotla changed the title Cherry picking scheduler and task reaper fixes, plus allocator logging. [18.03] Cherry picking scheduler and task reaper fixes, plus allocator logging. Jun 4, 2018
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.

3 participants