refactor: make code more encapsulate and logic simple #1540
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
allencloud
force-pushed
the
refactor-container
branch
3 times, most recently
from
99ed11b to
0cc66df
Compare
Codecov Report
@@ Coverage Diff @@
## master #1540 +/- ##
===========================================
+ Coverage 17.7% 41.29% +23.58%
===========================================
Files 214 257 +43
Lines 14367 16988 +2621
===========================================
+ Hits 2544 7015 +4471
+ Misses 11660 9101 -2559
- Partials 163 872 +709
|
|
Please help to review this pull request. @HusterWan @Letty5411 #!/bin/sh
set -x
set -e
while true ; do
containerName=ziren
pouch run -d --name $containerName busybox
pouch restart -t 1 $containerName
pouch rm -f $containerName
pouch ps -a
sleep 2
doneAnd it works fine with no legacy container exists on the local machine. Please help to check and review this. But there is still a log in pouchd's log: I think this is normal, since it is totally right from user's perspective. |
HusterWan
reviewed
Jun 19, 2018
daemon/mgr/container.go
Outdated
| if err != nil && !errtypes.IsNotfound(err) { | ||
| return errors.Wrapf(err, "failed to destroy container %s", c.ID) | ||
| return errors.Wrapf(err, "failed to destroy container %s when restarting", c.ID) |
There was a problem hiding this comment.
updated, thanks.
|
LGTM |
allencloud
force-pushed
the
refactor-container
branch
from
0cc66df to
743c2f4
Compare
HusterWan
reviewed
Jun 19, 2018
| } | ||
| // Remove io and network config may occur error, so we should update | ||
| // container's status on disk as soon as possible. | ||
| defer func() { |
There was a problem hiding this comment.
if Write failed, we can do nothing to recover, just record my confuse.
HusterWan
reviewed
Jun 19, 2018
| if err := m.RawError(); err != nil { | ||
| fmt.Fprintf(io.Stdout, "%v\n", err) | ||
| } | ||
| io := mgr.IOs.Get(id) |
There was a problem hiding this comment.
change the codes below to releaseContainerIOs ?
There was a problem hiding this comment.
I do not think we could do such change. since in the middle of the function, there is a fmt.Fprintf(io.Stdout, "%v\n", err)
allencloud
force-pushed
the
refactor-container
branch
3 times, most recently
from
d429700 to
cb93ee2
Compare
|
I have no more opinion about this PR, so when the ci pass, i will merge it. LGTM |
allencloud
force-pushed
the
refactor-container
branch
4 times, most recently
from
6e2b2f5 to
91e22c3
Compare
Signed-off-by: Allen Sun <allensun.shl@alibaba-inc.com>
allencloud
force-pushed
the
refactor-container
branch
from
91e22c3 to
b126b02
Compare
This was referenced Jun 21, 2018
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 allensun.shl@alibaba-inc.com
Ⅰ. Describe what this PR did
This pull request did these things:
SetStatusExitedstoppedinmarkExitedAndRelease;stoppedinRemoveaction.Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Describe how you did it
none
Ⅳ. Describe how to verify it
none
Ⅴ. Special notes for reviews
none