Skip to content

Bump ttrpc#3278

Merged
estesp merged 1 commit intocontainerd:masterfrom
masters-of-cats:pr-bump-ttrpc
May 13, 2019
Merged

Bump ttrpc#3278
estesp merged 1 commit intocontainerd:masterfrom
masters-of-cats:pr-bump-ttrpc

Conversation

@georgethebeatle
Copy link
Contributor

Co-authored-by: Giuseppe Capizzi gcapizzi@pivotal.io
Signed-off-by: Georgi Sabev georgethebeatle@gmail.com

This PR brings the file descriptor leak fix to containerd

Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented May 13, 2019

Build succeeded.

@crosbymichael
Copy link
Member

LGTM

@codecov-io
Copy link

Codecov Report

Merging #3278 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #3278   +/-   ##
======================================
  Coverage    44.4%   44.4%           
======================================
  Files         113     113           
  Lines       12231   12231           
======================================
  Hits         5431    5431           
  Misses       5966    5966           
  Partials      834     834
Flag Coverage Δ
#linux 48.33% <ø> (ø) ⬆️
#windows 39.68% <ø> (+0.01%) ⬆️

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 7ad8848...a6a888c. Read the comment docs.

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

@estesp estesp merged commit c0d0fc3 into containerd:master May 13, 2019
@yulianedyalkova
Copy link
Contributor

@crosbymichael @estesp do you plan on shipping a release with this change soon? Since it fixes a socket leak, we would like to get the fix in our systems as soon as possible. Thanks!

@estesp
Copy link
Member

estesp commented May 31, 2019

#3316 opened to fix release/1.2 for a future 1.2.x release

We have a small issue backporting to release/1.1 as we basically need a "custom" version of ttrpc from the stevvooe/ttrpc era that still uses containerd/log and specifically log.L. format logging. Otherwise we are editing a vendor/ file to make it build, which of course will not pass CI and shouldn't due to direct modification of vendor/ content. Do we make a branch of containerd/ttrpc for this?

@estesp
Copy link
Member

estesp commented May 31, 2019

@yulianedyalkova we should be preparing a 1.2.7 soon with several fixes that will include this as well. Are you on a 1.2.x release?

@yulianedyalkova
Copy link
Contributor

@estesp thank you, sounds good! Yes, we are currently using 1.2.6.

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