Skip to content

Fix shim delete error code.#3730

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-error-code
Oct 8, 2019
Merged

Fix shim delete error code.#3730
crosbymichael merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-error-code

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

The delete error code is not properly propagated.

Found this when working on containerd/cri#1309.

Let's cherrypick the fix, because the correct error code can avoid unnecessary retries in the CRI plugin.

Signed-off-by: Lantao Liu lantaol@google.com

Signed-off-by: Lantao Liu <lantaol@google.com>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Oct 8, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 8, 2019

Codecov Report

Merging #3730 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3730      +/-   ##
==========================================
+ Coverage   42.13%   42.15%   +0.01%     
==========================================
  Files         131      131              
  Lines       14474    14474              
==========================================
+ Hits         6099     6101       +2     
+ Misses       7467     7466       -1     
+ Partials      908      907       -1
Flag Coverage Δ
#linux 45.6% <ø> (+0.01%) ⬆️
#windows 37.16% <ø> (ø) ⬆️
Impacted Files Coverage Δ
snapshots/btrfs/btrfs.go 58.29% <0%> (+0.89%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 614c085...06be794. Read the comment docs.

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

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@jterry75
Copy link
Copy Markdown
Contributor

jterry75 commented Oct 8, 2019

The more I think about this I think in the future we should make this a gRPC or ttrpc interceptor that does this transform. There are other error cases in here that dont use ToGRPC and it seems pretty easy to make this mistake. What do you think?

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.

5 participants