AliyunContainerService / pouch

An Efficient Enterprise-class Container Engine
https://pouchcontainer.io
Apache License 2.0
4.64k stars 949 forks source link

fix return wrong error variable #3003

Closed yuzhiquan closed 4 years ago

yuzhiquan commented 4 years ago

Ⅰ. Describe what this PR did

fix return wrong error variable

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Yes

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov[bot] commented 4 years ago

Codecov Report

Merging #3003 into master will increase coverage by 1.24%. The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3003      +/-   ##
==========================================
+ Coverage   66.68%   67.93%   +1.24%     
==========================================
  Files         289      291       +2     
  Lines       18660    18691      +31     
==========================================
+ Hits        12443    12697     +254     
+ Misses       4770     4508     -262     
- Partials     1447     1486      +39
Flag Coverage Δ
#criv1alpha2_test 34.57% <0%> (?)
#integration_test_0 36.35% <0%> (-0.02%) :arrow_down:
#integration_test_1 35.98% <0%> (+0.11%) :arrow_up:
#integration_test_2 36.37% <0%> (+0.07%) :arrow_up:
#integration_test_3 35.84% <0%> (+0.04%) :arrow_up:
#node_e2e_test 33.96% <0%> (-0.19%) :arrow_down:
#unittest 26.63% <0%> (ø) :arrow_up:
Impacted Files Coverage Δ
ctrd/snapshot.go 50.66% <0%> (ø) :arrow_up:
daemon/mgr/container.go 60.09% <0%> (-1%) :arrow_down:
ctrd/container.go 50.62% <0%> (-0.54%) :arrow_down:
daemon/mgr/spec_apparmor_linux.go 20% <0%> (ø)
daemon/mgr/spec_seccomp_linux.go 71.42% <0%> (ø)
daemon/mgr/container_types.go 72.46% <0%> (+1.44%) :arrow_up:
cri/ocicni/cni_manager.go 61.32% <0%> (+1.88%) :arrow_up:
daemon/containerio/io.go 72.81% <0%> (+1.94%) :arrow_up:
daemon/mgr/spec_linux.go 79.26% <0%> (+2.67%) :arrow_up:
cri/v1alpha2/cri_utils.go 89.53% <0%> (+2.78%) :arrow_up:
... and 10 more
claassistantio commented 4 years ago

CLA assistant check
All committers have signed the CLA.

fuweid commented 4 years ago

@yuzhiquan thanks for sending this pr. We are thinking that both IsUnpack and Unpack actions are retrying. If those actions fails, we only report the warning message and still return the original error created by Prepare.

yuzhiquan commented 4 years ago

@yuzhiquan thanks for sending this pr. We are thinking that both IsUnpack and Unpack actions are retrying. If those actions fails, we only report the warning message and still return the original error created by Prepare.

ok, that's explain it.