Skip to content

Fix panic in shim not logged#4657

Merged
AkihiroSuda merged 2 commits intocontainerd:masterfrom
mxpv:master
Oct 26, 2020
Merged

Fix panic in shim not logged#4657
AkihiroSuda merged 2 commits intocontainerd:masterfrom
mxpv:master

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Oct 26, 2020

Carry #4298
Fix #4274

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 26, 2020

Build succeeded.

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

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

@AkihiroSuda AkihiroSuda merged commit f51d5f7 into containerd:master Oct 26, 2020
@BenTheElder
Copy link
Copy Markdown
Contributor

This broke arm64 I think, https://travis-ci.com/github/kind-ci/containerd-nightlies/jobs/407844501

vendor/github.com/containerd/fifo/fifo.go:51:12: undefined: syscall.Dup2

dup2 is not on arm64 golang/go#11981

@BenTheElder
Copy link
Copy Markdown
Contributor

filed containerd/fifo#27, I think it should be fairly straightforward to fix.

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks!

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.

panic in shim is not logged

5 participants