Skip to content

update go-runc module, use runc.ExitError for container exec status#1741

Merged
AkihiroSuda merged 1 commit into
moby:masterfrom
coryb:runc-exiterror
Oct 20, 2020
Merged

update go-runc module, use runc.ExitError for container exec status#1741
AkihiroSuda merged 1 commit into
moby:masterfrom
coryb:runc-exiterror

Conversation

@coryb
Copy link
Copy Markdown
Collaborator

@coryb coryb commented Oct 20, 2020

This fixes status error handling for runc exec, also makes status error messages common between runc and containerd executors.

Pulls in latest go-runc mod. Runc.PdeathSignal has been moved upstream to be unix only, so I have made the corresponding fix for the runc executor also.

Comment thread executor/runcexecutor/executor_linux.go Outdated
func (w *runcExecutor) run(ctx context.Context, id, bundle string, process executor.ProcessInfo) (int, error) {
return w.callWithIO(ctx, id, bundle, process, func(ctx context.Context, pidfile string, io runc.IO) (int, error) {
return w.runc.Run(ctx, id, bundle, &runc.CreateOpts{
func updateRuntime(runtime *runc.Runc) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

could we use a more descriptive name for the functionality

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

yeah, I didn't know what to call that. I have updated to updateRuncFieldsForHostOS which is not great either but is more descriptive. Let me know if you have a better name to use.

Signed-off-by: Cory Bennett <cbennett@netflix.com>
@AkihiroSuda AkihiroSuda merged commit 48991bf into moby:master Oct 20, 2020
@tonistiigi
Copy link
Copy Markdown
Member

@AkihiroSuda Could you review containerd/go-runc#69 as well

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.

3 participants