bugfix: list image should ignore error if containerd can't handle well #1625
+4
−3
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
Since the containerd doesn't identify the application/octet-stream media type, it will cause ListImages API fails to return images to the caller. In order to avoid odd thing happen and add patch to containerd, we should ignore the error to make PouchContainer robust. Signed-off-by: Wei Fu <fhfuwei@163.com>
|
LGTM, after ci pass, i will merge this PR |
pouchrobot
added
the
LGTM
HusterWan
reviewed
Jul 5, 2018
| @@ -150,7 +150,8 @@ func (mgr *ImageManager) ListImages(ctx context.Context, filter ...string) ([]ty | |||
| for _, img := range imgs { | |||
| imgCfg, err := img.Config(ctx) | |||
| if err != nil { | |||
| return nil, err | |||
| logrus.Warnf("failed to get image config info during list images: %v", err) | |||
There was a problem hiding this comment.
maybe we should print some WARN info in cli side , like ctr ：
#ctr --address /var/run/containerd.sock images ls
WARN[0000] encountered unknown type application/octet-stream; children may not be fetched
WARN[0000] encountered unknown type application/octet-stream; children may not be fetched
There was a problem hiding this comment.
I think it is quite hard to do so in cli side. Since cli is heavily relying on the api, and if the api side does not return the error or warning message, nothing could be done in cli side, I think.
Codecov Report
@@ Coverage Diff @@
## master #1625 +/- ##
==========================================
- Coverage 41.99% 41.99% -0.01%
==========================================
Files 270 270
Lines 17597 17599 +2
==========================================
Hits 7390 7390
- Misses 9298 9300 +2
Partials 909 909
|
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.
Ⅰ. Describe what this PR did
Since the containerd doesn't identify the application/octet-stream media
type, it will cause ListImages API fails to return images to the caller.
In order to avoid odd thing happen and add patch to containerd, we
should ignore the error to make PouchContainer robust.
Ⅱ. Does this pull request fix one issue?
Fixed #1583
Ⅲ. Describe how you did it
Ignore the error.
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews