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.

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

Update runc to 9f9c96235cc97674e935002fc3d78361b69 #2048

Merged
merged 1 commit into from Jan 23, 2018

Conversation

Projects
None yet
4 participants
@crosbymichael
Copy link
Member

commented Jan 23, 2018

This fixes issues for init and exec hanging forever when an error
happens on start.

Fixes #1882

Signed-off-by: Michael Crosby crosbymichael@gmail.com

Update runc to 9f9c96235cc97674e935002fc3d78361b69
This fixes issues for init and exec hanging forever when an error
happends on start.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@@ -134,3 +134,14 @@ func RunningInUserNS() bool {
func SetSubreaper(i int) error {
return unix.Prctl(PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0)
}

// GetSubreaper returns the subreaper setting for the calling process
func GetSubreaper() (int, error) {

This comment has been minimized.

Copy link
@stevvooe

stevvooe Jan 23, 2018

Member

Same question: How does this fix work? Is this function called somewhere?

This comment has been minimized.

Copy link
@crosbymichael

crosbymichael Jan 23, 2018

Author Member

its called in runc

@stevvooe

This comment has been minimized.

Copy link
Member

commented Jan 23, 2018

LGTM

@crosbymichael crosbymichael added this to the 1.0.2 milestone Jan 23, 2018

@stevvooe

This comment has been minimized.

Copy link
Member

commented Jan 23, 2018

For the record, this pulls in opencontainers/runc#1698 as the fix. This is not reflected in the vendored files because this is purely a runc bug that affect binary builds of runc.

@crosbymichael

This comment has been minimized.

Copy link
Member Author

commented Jan 23, 2018

The travis errors was from runc not being a static build. I don't see anything in the diff that would have made this change but maybe something within the travis distro was removed and we are missing a lib.

@codecov-io

This comment has been minimized.

Copy link

commented Jan 23, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2048   +/-   ##
=======================================
  Coverage   45.46%   45.46%           
=======================================
  Files          96       96           
  Lines        9401     9401           
=======================================
  Hits         4274     4274           
  Misses       4417     4417           
  Partials      710      710
Flag Coverage Δ
#linux 50.38% <ø> (ø) ⬆️
#windows 40.37% <ø> (ø) ⬆️

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 cee56a1...8dfbd59. Read the comment docs.

@crosbymichael

This comment has been minimized.

Copy link
Member Author

commented Jan 23, 2018

@estesp ok, good to review again

@estesp

estesp approved these changes Jan 23, 2018

Copy link
Contributor

left a comment

LGTM

@crosbymichael crosbymichael merged commit 410db39 into containerd:master Jan 23, 2018

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details

@crosbymichael crosbymichael deleted the crosbymichael:bump-runc branch Jan 23, 2018

@pires pires referenced this pull request Jan 26, 2018

Closed

containerd hangs #1882

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.