Skip to content

[release/1.2 backport] Update ttrpc#3250

Merged
dmcgowan merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_ttrpc
May 6, 2019
Merged

[release/1.2 backport] Update ttrpc#3250
dmcgowan merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_ttrpc

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backports of;

cpuguy83 and others added 2 commits April 29, 2019 15:23
Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 0befa45)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 <[email protected]>
(cherry picked from commit 8c5779c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link
Copy Markdown

codecov-io commented May 3, 2019

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.

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member

cpuguy83 commented May 6, 2019

Here it is: #2944

@thaJeztah
Copy link
Copy Markdown
Member Author

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

Copy link
Copy Markdown
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

Copy link
Copy Markdown
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants