Skip to content

[17.12] [manager/dispatcher] Synchronize Dispatcher.Stop() with incoming rpcs.#2514

Closed
thaJeztah wants to merge 3 commits into
moby:bump_v17.12from
thaJeztah:17.12-backport-agent2
Closed

[17.12] [manager/dispatcher] Synchronize Dispatcher.Stop() with incoming rpcs.#2514
thaJeztah wants to merge 3 commits into
moby:bump_v17.12from
thaJeztah:17.12-backport-agent2

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #2495 for 17.12

Also included #2486 to get a clean cherry-pick

@thaJeztah
Copy link
Copy Markdown
Member Author

ping @anshulpundir PTAL: let me know if it's ok to include #2486 as well

@anshulpundir
Copy link
Copy Markdown
Contributor

Its OK to include #2486, but you must also include #2492 @thaJeztah

@thaJeztah thaJeztah force-pushed the 17.12-backport-agent2 branch from 968e75e to d4c64ed Compare February 13, 2018 19:50
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 13, 2018

Codecov Report

Merging #2514 into bump_v17.12 will decrease coverage by 5.27%.
The diff coverage is 78.18%.

@@               Coverage Diff               @@
##           bump_v17.12    #2514      +/-   ##
===============================================
- Coverage        66.92%   61.64%   -5.28%     
===============================================
  Files               76      129      +53     
  Lines            11158    21263   +10105     
===============================================
+ Hits              7467    13108    +5641     
- Misses            2929     6751    +3822     
- Partials           762     1404     +642

Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit 6fa4dda)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit 7d507f6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit 0b2778a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 17.12-backport-agent2 branch from d4c64ed to faf6913 Compare February 13, 2018 19:51
@thaJeztah
Copy link
Copy Markdown
Member Author

Added #2492 👍

@thaJeztah
Copy link
Copy Markdown
Member Author

Looks like additional changes may be needed: #2495 (comment)

@thaJeztah
Copy link
Copy Markdown
Member Author

Update on the additional changes needed; moby/moby#36274 (review)

@nishanttotla and I discussed the data race failure in unit-tests and it should be OK to move forward. Because of how the waitgroup is used, the race should not have any undesired side-effects.

@anshulpundir @nishanttotla should this be ok to merge?

@thaJeztah
Copy link
Copy Markdown
Member Author

Looks like #2495 is being reverted in #2518

@andrewhsu
Copy link
Copy Markdown

This PR should be closed because #2495 is not the best way to fix the thing. The better fix is in #2519

@thaJeztah
Copy link
Copy Markdown
Member Author

Do we still need #2492 ?

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