-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Conversation
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) { |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
its called in runc
LGTM |
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. |
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 Report
@@ Coverage Diff @@
## master #2048 +/- ##
=======================================
Coverage 45.46% 45.46%
=======================================
Files 96 96
Lines 9401 9401
=======================================
Hits 4274 4274
Misses 4417 4417
Partials 710 710
Continue to review full report at Codecov.
|
@estesp ok, good to review again |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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