fix: return error if it fails to tear down network in stopsandbox #2836
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
Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
treat it as success if the the netns dont exists, otherwise, return error kubelet will retry the StopPodSandbox method, avoiding cni leaking Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #2836 +/- ##
=========================================
+ Coverage 69.09% 69.1% +<.01%
=========================================
Files 285 285
Lines 17779 17780 +1
=========================================
+ Hits 12285 12287 +2
+ Misses 4097 4095 -2
- Partials 1397 1398 +1
|
allencloud
reviewed
May 13, 2019
| @@ -473,7 +473,7 @@ func (c *CriManager) StopPodSandbox(ctx context.Context, r *runtime.StopPodSandb | |||
| // Teardown network of the pod, if it is not in host network mode. | |||
| if sandboxNetworkMode(sandboxMeta.Config) != runtime.NamespaceMode_NODE { | |||
| if err = c.teardownNetwork(podSandboxID, sandboxMeta.NetNS, sandboxMeta.Config); err != nil { | |||
| logrus.Warnf("failed to find network namespace file %s of sandbox %s which may have been already stopped", sandboxMeta.NetNS, podSandboxID) | |||
| return nil, fmt.Errorf("failed to teardown network of sandbox %s, ns path: %v", podSandboxID, sandboxMeta.NetNS) | |||
There was a problem hiding this comment.
Why not output the detailed err?
allencloud
reviewed
May 13, 2019
| if _, err = os.Stat(podNetwork.NetNS); err != nil { | ||
| if os.IsNotExist(err) { | ||
| logrus.Warnf("failed to find network namespace file %s of sandbox %s", podNetwork.NetNS, podNetwork.ID) |
There was a problem hiding this comment.
Why not output the detailed error?
|
LGTM |
pouchrobot
added
the
LGTM
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
treat it as success if the the netns dont exists, otherwise, return error
kubelet will retry the StopPodSandbox method, avoiding cni leaking
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews