fix: make stop stopped container return no error #1209
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: Allen Sun <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #1209 +/- ##
==========================================
+ Coverage 15.57% 15.59% +0.01%
==========================================
Files 178 178
Lines 10454 10441 -13
==========================================
Hits 1628 1628
+ Misses 8706 8693 -13
Partials 120 120
|
|
LGTM |
pouchrobot
added
the
LGTM
HusterWan
reviewed
Apr 25, 2018
| @@ -706,8 +706,9 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6 | |||
| c.Lock() | |||
| defer c.Unlock() | |||
|
|
|||
| if !c.IsRunning() { | |||
| return fmt.Errorf("container's status is not running: %s", c.meta.State.Status) | |||
| if c.IsStopped() { | |||
There was a problem hiding this comment.
create a new container, it's status is "created", actually, the container is stopped, but IsStopped() will return false
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: Allen Sun [email protected]
Ⅰ. Describe what this PR did
make stop stopped container return no error.
This will be compatible with moby's API.
Ⅱ. Does this pull request fix one issue?
fxies #1207
Ⅲ. Describe how you did it
none
Ⅳ. Describe how to verify it
none
Ⅴ. Special notes for reviews
none