kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Don't throw "restartmanager canceled" error for no restart policy container

Browse source 
Don't throw "restartmanager canceled" error for no restart policy container
and add the container id to the warning message if a container has restart policy
and has been canceled.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2016-04-14 21:40:20 -04:00
parent 348d902768
commit 494297baf8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcontainerd/container_linux.go
View file

@ -120,7 +120,7 @@ func (ctr *container) handleEvent(e *containerd.Event) error {
if st.State == StateExit && ctr.restartManager != nil { if st.State == StateExit && ctr.restartManager != nil {
restart, wait, err := ctr.restartManager.ShouldRestart(e.Status, false) restart, wait, err := ctr.restartManager.ShouldRestart(e.Status, false)
if err != nil { if err != nil {
logrus.Error(err) logrus.Warnf("container %s %v", ctr.containerID, err)
} else if restart { } else if restart {
st.State = StateRestart st.State = StateRestart
ctr.restarting = true ctr.restarting = true

3
restartmanager/restartmanager.go
View file

@ -42,6 +42,9 @@ func (rm *restartManager) SetPolicy(policy container.RestartPolicy) {
} }
func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool) (bool, chan error, error) { func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool) (bool, chan error, error) {
if rm.policy.IsNone() {
return false, nil, nil
}
rm.Lock() rm.Lock()
unlockOnExit := true unlockOnExit := true
defer func() { defer func() {