bugfix: return pid with 0 rather than -1 #2269
Merged
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: Starnop <starnop@163.com>
Codecov Report
@@ Coverage Diff @@
## master #2269 +/- ##
==========================================
- Coverage 66.76% 66.66% -0.11%
==========================================
Files 208 208
Lines 16932 16938 +6
==========================================
- Hits 11305 11292 -13
- Misses 4261 4277 +16
- Partials 1366 1369 +3
|
allencloud
reviewed
Sep 21, 2018
| @@ -97,7 +97,7 @@ func (c *Container) SetStatusRunning(pid int64) { | |||
| // When a container's status turns to StatusStopped, the following fields need updated: | |||
| // Status -> StatusStopped | |||
| // FinishedAt -> time.Now() | |||
| // Pid -> -1 | |||
| // Pid -> 0 | |||
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: Starnop starnop@163.com
Ⅰ. Describe what this PR did
Kubernetes will check the value of pid when the container stopped and the pid is 0 when container stopped, so when we build network namespace, we should make a judgment according to whether
Pidequals to0rather than-1in CRI Manager.Ⅱ. Does this pull request fix one issue?
fixes #2255
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Has been updated.
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews