bugfix: set pid of stopped container to 0 #2193
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
fuweid
reviewed
Sep 3, 2018
| @@ -126,3 +126,21 @@ func (suite *PouchStopSuite) TestStopMultiContainers(c *check.C) { | |||
| c.Assert(string(result[0].State.Status), check.Equals, "stopped") | |||
|
|
|||
| } | |||
|
|
|||
| // TestStopPidValue ensure stopped container's pid is 0 | |||
| func (suite *PouchStopSuite) TestStopPidValue(c *check.C) { | |||
There was a problem hiding this comment.
please add one case for the process exits by itself.
Signed-off-by: Michael Wan <[email protected]>
HusterWan
force-pushed
the
zr/pid-fix
branch
from
b2408ba to
e52903a
Compare
|
LGTM |
pouchrobot
added
the
LGTM
|
You have filled up the beautiful pull request description. @HusterWan |
Codecov Report
@@ Coverage Diff @@
## master #2193 +/- ##
==========================================
+ Coverage 59.91% 64.97% +5.06%
==========================================
Files 209 209
Lines 16739 16739
==========================================
+ Hits 10029 10877 +848
+ Misses 5488 4515 -973
- Partials 1222 1347 +125
|
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: Michael Wan [email protected]
Ⅰ. Describe what this PR did
We set pid of stopped container to
-1before, it's ok that we do not check value of pid but the status of container when we want to check whether the container is stopped or not.But now,
pouchdsupportedCRI, the k8s will check the value of pid when the container stopped and the pid is0when container stopped.So, in order to stay with moby and kubernetes, we also should change the pid to
0when the container is stopped.Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
added
TestStopPidValuetest caseⅣ. Describe how to verify it
Ⅴ. Special notes for reviews
None