ociruntime: fix blocking on unknown tar header #8017
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bduffany
reviewed
Dec 5, 2024
| @@ -1369,7 +1369,7 @@ func downloadLayer(ctx context.Context, layer ctr.Layer, destDir string) error { | |||
| return status.UnavailableErrorf("chown file: %s", err) | |||
| } | |||
| default: | |||
| return status.UnavailableErrorf("unsupported tar entry type %q", header.Typeflag) | |||
| log.CtxWarningf(ctx, "Ignoring unsupported tar header %q type %q in oci layer", header.Name, header.Typeflag) | |||
There was a problem hiding this comment.
nit: I think these warnings will be spammy. Would it work to explicitly skip character and block devices?
There was a problem hiding this comment.
or alternatively just log at info level for now.
bduffany
reviewed
Dec 5, 2024
enterprise/server/remote_execution/containers/ociruntime/ociruntime.go
Outdated
Show resolved
Hide resolved
bduffany
approved these changes
Dec 5, 2024
|
turning this to draft to do a bit more testing. We reverted the original PR instead. |
sluongng
force-pushed
the
sluongng/fix-device-tar-unpack
branch
from
30405e1 to
9f4b3cd
Compare
|
Replacing this PR with #8023 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It seems like our "executor-docker-default" image contains quite a few
/dev/*entries in a layer on the image.These are either block or character devices that don't do much on the
container itself and should be safe to ignore.