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

Remove restart canceled error

Browse source 
It should not be an error to call a common option to cancel restarts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-04-18 11:48:28 -07:00
parent a4030787f5
commit fc2e2234c6
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libcontainerd/container_linux.go
View file

@ -9,6 +9,7 @@ import (
"github.com/Sirupsen/logrus"
containerd "github.com/docker/containerd/api/grpc/types"
"github.com/docker/docker/restartmanager"
"github.com/opencontainers/specs/specs-go"
"golang.org/x/net/context"
)
@ -135,7 +136,9 @@ func (ctr *container) handleEvent(e *containerd.Event) error {
logrus.Error(err)
}
})
logrus.Error(err)
if err != restartmanager.ErrRestartCanceled {
logrus.Error(err)
}
} else {
ctr.start()
}

9
restartmanager/restartmanager.go
View file

@ -1,6 +1,7 @@
package restartmanager
import (
"errors"
"fmt"
"sync"
"time"
@ -13,6 +14,10 @@ const (
defaultTimeout = 100 * time.Millisecond
)
// ErrRestartCanceled is returned when the restart manager has been
// canceled and will no longer restart the container.
var ErrRestartCanceled = errors.New("restart canceled")
// RestartManager defines object that controls container restarting rules.
type RestartManager interface {
Cancel() error
@ -54,7 +59,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped
}()
if rm.canceled {
return false, nil, fmt.Errorf("restartmanager canceled")
return false, nil, ErrRestartCanceled
}
if rm.active {
@ -95,7 +100,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped
go func() {
select {
case <-rm.cancel:
ch <- fmt.Errorf("restartmanager canceled")
ch <- ErrRestartCanceled
close(ch)
case <-time.After(rm.timeout):
rm.Lock()