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

crosbymichael
Copy link
Member

@crosbymichael crosbymichael 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

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) {
Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

its called in runc

@stevvooe
Copy link
Member

LGTM

@crosbymichael crosbymichael added this to the 1.0.2 milestone Jan 23, 2018
@stevvooe
Copy link
Member

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

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

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

@estesp ok, good to review again

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

@crosbymichael crosbymichael merged commit 410db39 into containerd:master Jan 23, 2018
@crosbymichael crosbymichael deleted the bump-runc branch January 23, 2018 19:37
@pires pires mentioned this pull request Jan 26, 2018
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.

containerd hangs
4 participants