Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/1.2 backport] Update ttrpc #3250

Merged
merged 2 commits into from May 6, 2019
Merged

[release/1.2 backport] Update ttrpc #3250

merged 2 commits into from May 6, 2019

Conversation

thaJeztah
Copy link
Member

backports of;

cpuguy83 and others added 2 commits April 29, 2019 15:23
@cpuguy83 @thaJeztah
Update ttrpc to support context timeout.
5f1c66f 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0befa45)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
79f6941 
full diff: containerd/ttrpc@f02858b...699c4e4

- containerd/ttrpc#33 Fix returns error message
- containerd/ttrpc#35 Make onclose an option

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8c5779c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-io
Copy link

codecov-io commented May 3, 2019 •
edited

Codecov Report

Merging #3250 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3250   +/-   ##
============================================
  Coverage        43.74%   43.74%           
============================================
  Files              101      101           
  Lines            10743    10743           
============================================
  Hits              4700     4700           
  Misses            5311     5311           
  Partials           732      732
Flag Coverage Δ
#linux 47.38% <ø> (ø) ⬆️
#windows 40.85% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update af407fb...79f6941. Read the comment docs.

estesp
estesp approved these changes May 5, 2019
View reviewed changes
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Member

cpuguy83 commented May 5, 2019

There was a patch needed in containerd to not send timeouts through ttrpc for certain cases.

@cpuguy83
Copy link
Member

cpuguy83 commented May 6, 2019

Here it is: #2944

@thaJeztah
Copy link
Member Author

@cpuguy83 looks like that one was cherry-picked in the 1.2 branch already through #2955

cpuguy83
cpuguy83 approved these changes May 6, 2019
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

dmcgowan
dmcgowan approved these changes May 6, 2019
View reviewed changes
Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit 9196892 into containerd:release/1.2 May 6, 2019
@thaJeztah thaJeztah deleted the 1.2_backport_bump_ttrpc branch May 6, 2019 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@estesp estesp estesp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thaJeztah @codecov-io @cpuguy83 @dmcgowan @estesp