bugfix: should initialize ContainerIO for all container #2668
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
Codecov Report
@@ Coverage Diff @@
## master #2668 +/- ##
==========================================
+ Coverage 56.82% 69.63% +12.8%
==========================================
Files 281 281
Lines 18794 18795 +1
==========================================
+ Hits 10679 13087 +2408
+ Misses 6879 4250 -2629
- Partials 1236 1458 +222
|
fuweid
changed the title
fuweid
changed the title
rudyfly
reviewed
Jan 16, 2019
| // when container is stopped and then pouchd restarts, the restore logic should | ||
| // initialize the existing container IO settings even though they are not alive. | ||
| func (suite *PouchDaemonSuite) TestRestartStoppedContainerAfterDaemonRestart(c *check.C) { | ||
| cfg := daemon.NewConfig() |
There was a problem hiding this comment.
Is start daemon with config file? or with command line as before?
And we need think about alios test.
daemon/mgr/container.go
Outdated
| id := c.Key() | ||
| // recover the running or paused container. | ||
|
|
||
| // NOTE: when pouch restarts, we need to initialize container IO |
| @@ -280,6 +281,13 @@ func (mgr *ContainerManager) Restore(ctx context.Context) error { | |||
| return err | |||
| } | |||
|
|
|||
| // recover the running or paused container. | |||
| if !(c.IsRunning() || c.IsPaused()) { | |||
There was a problem hiding this comment.
running or paused containers don't to recover?
There was a problem hiding this comment.
no need to recover the created/stopped container
HusterWan
reviewed
Jan 16, 2019
fuweid
changed the title
For now, when pouchd restarts, the restore function only re-connects to existing running/pause containers with initializing container IO. However, the stopped container also needs the container IO if the user want to restart the container. For the case, we need to initialize container IO for all existing container, not just for running/pause containers. Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid
changed the title
|
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
For now, when pouchd restarts, the restore function only re-connects to
existing running/pause containers with initializing container IO.
However, the stopped container also needs the container IO if the user
want to restart the container. For the case, we need to initialize
container IO for all existing container, not just for running/pause
containers.
Signed-off-by: Wei Fu fuweid89@gmail.com
Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
add one
Ⅳ. Describe how to verify it
CI
Ⅴ. Special notes for reviews