Skip to content

Fix delete error code on the containerd daemon side.#3736

Merged
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:final-fix-delete-code
Oct 9, 2019
Merged

Fix delete error code on the containerd daemon side.#3736
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:final-fix-delete-code

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

With more test, I found that #3730 is not enough:

  1. The containerd daemon doesn't return grpc error properly;
  2. The fix Return NotFound error for kill and delete in deleted state. #3244 never worked, because the returned error is not converted to internal errors. And after converting to internal error, we didn't handle the nil response properly.

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 9, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 9, 2019

Codecov Report

Merging #3736 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3736      +/-   ##
==========================================
- Coverage   42.13%   42.12%   -0.02%     
==========================================
  Files         131      131              
  Lines       14474    14479       +5     
==========================================
  Hits         6099     6099              
- Misses       7467     7472       +5     
  Partials      908      908
Flag Coverage Δ
#linux 45.57% <0%> (-0.02%) ⬇️
#windows 37.15% <0%> (-0.02%) ⬇️
Impacted Files Coverage Δ
runtime/v2/shim.go 1.16% <0%> (-0.02%) ⬇️

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 772aaf1...ffcb1cc. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

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

@estesp estesp merged commit a6a0c8b into containerd:master Oct 9, 2019
@estesp
Copy link
Copy Markdown
Member

estesp commented Oct 9, 2019

I assume since #3730 was cherry picked back to 1.2 and 1.3 then we need this one as well.

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.

4 participants