bugfix: convert container err into pouchd manager error #2034
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
Codecov Report
@@ Coverage Diff @@
## master #2034 +/- ##
==========================================
+ Coverage 64.05% 64.06% +0.01%
==========================================
Files 202 202
Lines 15510 15588 +78
==========================================
+ Hits 9935 9987 +52
- Misses 4338 4352 +14
- Partials 1237 1249 +12
|
fuweid
reviewed
Aug 3, 2018
ctrd/image.go
Outdated
| @@ -170,6 +220,9 @@ func (c *Client) PullImage(ctx context.Context, ref string, authConfig *types.Au | |||
|
|
|||
| // start to pull image. | |||
| img, err := c.pullImage(ctx, wrapperCli, ref, options) | |||
| if err != nil { | |||
There was a problem hiding this comment.
we don't need to convert err here. the error is in the jsonstream message, not http status
ctrd/utils.go
Outdated
| "github.com/alibaba/pouch/pkg/utils" | ||
| "github.com/pkg/errors" |
| } | ||
|
|
||
| if errdefs.IsAlreadyExists(err) { | ||
| return errors.Wrap(errtypes.ErrAlreadyExisted, err.Error()) |
There was a problem hiding this comment.
it;s ok to have duplicate error message. we might find the way to hack it and remove the duplicated message
allencloud
force-pushed
the
convert-err
branch
7 times, most recently
from
002144c
to
e6141d0
Compare
Signed-off-by: Allen Sun <allensun.shl@alibaba-inc.com>
|
ping @fuweid PTAL |
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.
Signed-off-by: Allen Sun allensun.shl@alibaba-inc.com
Ⅰ. Describe what this PR did
This pull request converts the error from containerd side to pouch manager side.
For the error part, we have the following part:
github.com/containerd/containerd/errdefsgithub.com/alibaba/pouch/pkg/errtypes, this is used for API layers to construct http status code in./apis/server/routes.goSo if we need to make use of error returned from containerd client which is
ctrd, then we should convert those errors into errtypes which could be used in mgrs. This will transfer errors from containerd correctly to mgrs and API layers.Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Describe how you did it
none
Ⅳ. Describe how to verify it
none
Ⅴ. Special notes for reviews
none