Skip to content

[18.03] Fix racy batching on the dispatcher.#2695

Merged
dperny merged 1 commit into
moby:bump_v18.03from
thaJeztah:18.03-backport-dispatcher-batch-timer
Jul 9, 2018
Merged

[18.03] Fix racy batching on the dispatcher.#2695
dperny merged 1 commit into
moby:bump_v18.03from
thaJeztah:18.03-backport-dispatcher-batch-timer

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

cherry-pick of #2676 for 18.03

git checkout -b 18.03-backport-dispatcher-batch-timer upstream/bump_v18.03
git cherry-pick -s -S -x 317ad86ad8fab82e8e3359d44407951c2e3cb4d2

cherry-pick was clean

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 317ad86)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @cyli @dperny - wasn't sure if we needed this; discussion on the original PR seemed to be "not critical, but good to have" ?

@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 7, 2018

Codecov Report

Merging #2695 into bump_v18.03 will increase coverage by 0.02%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##           bump_v18.03    #2695      +/-   ##
===============================================
+ Coverage         61.6%   61.63%   +0.02%     
===============================================
  Files              134      134              
  Lines            21795    21799       +4     
===============================================
+ Hits             13426    13435       +9     
- Misses            6929     6933       +4     
+ Partials          1440     1431       -9

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 - I believe this is not critical - I don't think this should cause any issues aside from the batch running slightly more? But it's more correct. :)

@dperny
Copy link
Copy Markdown
Collaborator

dperny commented Jul 9, 2018

Yeah, there's no harm at all in including this, it can only help.

@dperny dperny merged commit 9748467 into moby:bump_v18.03 Jul 9, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-dispatcher-batch-timer branch July 9, 2018 22:49
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