@@ -22,6 +22,7 @@ import (

 	mounttypes "github.com/docker/docker/api/types/mount"

 	swarmtypes "github.com/docker/docker/api/types/swarm"

 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

+	"github.com/docker/docker/daemon/internal/restartmanager"

 	"github.com/docker/docker/daemon/internal/stream"

 	"github.com/docker/docker/daemon/logger"

 	"github.com/docker/docker/daemon/logger/jsonfilelog"

@@ -31,7 +32,6 @@ import (

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/oci"

-	"github.com/docker/docker/restartmanager"

 	"github.com/docker/docker/volume"

 	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/docker/go-units"

new file mode 100644

@@ -0,0 +1,132 @@

+package restartmanager

+

+import (

+	"errors"

+	"sync"

+	"time"

+

+	"github.com/docker/docker/api/types/container"

+)

+

+const (

+	backoffMultiplier = 2

+	defaultTimeout    = 100 * time.Millisecond

+	maxRestartTimeout = 1 * time.Minute

+)

+

+// 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 struct {

+	sync.Mutex

+	sync.Once

+	policy       container.RestartPolicy

+	restartCount int

+	timeout      time.Duration

+	active       bool

+	cancel       chan struct{}

+	canceled     bool

+}

+

+// New returns a new RestartManager based on a policy.

+func New(policy container.RestartPolicy, restartCount int) *RestartManager {

+	return &RestartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})}

+}

+

+// SetPolicy sets the restart-policy for the RestartManager.

+func (rm *RestartManager) SetPolicy(policy container.RestartPolicy) {

+	rm.Lock()

+	rm.policy = policy

+	rm.Unlock()

+}

+

+// ShouldRestart returns whether the container should be restarted.

+func (rm *RestartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool, executionDuration time.Duration) (bool, chan error, error) {

+	if rm.policy.IsNone() {

+		return false, nil, nil

+	}

+	rm.Lock()

+	unlockOnExit := true

+	defer func() {

+		if unlockOnExit {

+			rm.Unlock()

+		}

+	}()

+

+	if rm.canceled {

+		return false, nil, ErrRestartCanceled

+	}

+

+	if rm.active {

+		return false, nil, errors.New("invalid call on an active restart manager")

+	}

+	// if the container ran for more than 10s, regardless of status and policy reset

+	// the timeout back to the default.

+	if executionDuration.Seconds() >= 10 {

+		rm.timeout = 0

+	}

+	switch {

+	case rm.timeout == 0:

+		rm.timeout = defaultTimeout

+	case rm.timeout < maxRestartTimeout:

+		rm.timeout *= backoffMultiplier

+	}

+	if rm.timeout > maxRestartTimeout {

+		rm.timeout = maxRestartTimeout

+	}

+

+	var restart bool

+	switch {

+	case rm.policy.IsAlways():

+		restart = true

+	case rm.policy.IsUnlessStopped() && !hasBeenManuallyStopped:

+		restart = true

+	case rm.policy.IsOnFailure():

+		// the default value of 0 for MaximumRetryCount means that we will not enforce a maximum count

+		if maxRetryCount := rm.policy.MaximumRetryCount; maxRetryCount == 0 || rm.restartCount < maxRetryCount {

+			restart = exitCode != 0

+		}

+	}

+

+	if !restart {

+		rm.active = false

+		return false, nil, nil

+	}

+

+	rm.restartCount++

+

+	unlockOnExit = false

+	rm.active = true

+	rm.Unlock()

+

+	ch := make(chan error)

+	go func() {

+		timeout := time.NewTimer(rm.timeout)

+		defer timeout.Stop()

+

+		select {

+		case <-rm.cancel:

+			ch <- ErrRestartCanceled

+			close(ch)

+		case <-timeout.C:

+			rm.Lock()

+			close(ch)

+			rm.active = false

+			rm.Unlock()

+		}

+	}()

+

+	return true, ch, nil

+}

+

+// Cancel tells the RestartManager to no longer restart the container.

+func (rm *RestartManager) Cancel() {

+	rm.Do(func() {

+		rm.Lock()

+		rm.canceled = true

+		close(rm.cancel)

+		rm.Unlock()

+	})

+}

new file mode 100644

@@ -0,0 +1,36 @@

+package restartmanager

+

+import (

+	"testing"

+	"time"

+

+	"github.com/docker/docker/api/types/container"

+)

+

+func TestRestartManagerTimeout(t *testing.T) {

+	rm := New(container.RestartPolicy{Name: "always"}, 0)

+	duration := 1 * time.Second

+	should, _, err := rm.ShouldRestart(0, false, duration)

+	if err != nil {

+		t.Fatal(err)

+	}

+	if !should {

+		t.Fatal("container should be restarted")

+	}

+	if rm.timeout != defaultTimeout {

+		t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)

+	}

+}

+

+func TestRestartManagerTimeoutReset(t *testing.T) {

+	rm := New(container.RestartPolicy{Name: "always"}, 0)

+	rm.timeout = 5 * time.Second

+	duration := 10 * time.Second

+	_, _, err := rm.ShouldRestart(0, false, duration)

+	if err != nil {

+		t.Fatal(err)

+	}

+	if rm.timeout != defaultTimeout {

+		t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)

+	}

+}

@@ -14,7 +14,7 @@ import (

 	"github.com/docker/docker/daemon/container"

 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

 	"github.com/docker/docker/daemon/internal/metrics"

-	"github.com/docker/docker/restartmanager"

+	"github.com/docker/docker/daemon/internal/restartmanager"

 	"github.com/pkg/errors"

 )

deleted file mode 100644

@@ -1,132 +0,0 @@

-package restartmanager

-

-import (

-	"errors"

-	"sync"

-	"time"

-

-	"github.com/docker/docker/api/types/container"

-)

-

-const (

-	backoffMultiplier = 2

-	defaultTimeout    = 100 * time.Millisecond

-	maxRestartTimeout = 1 * time.Minute

-)

-

-// 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 struct {

-	sync.Mutex

-	sync.Once

-	policy       container.RestartPolicy

-	restartCount int

-	timeout      time.Duration

-	active       bool

-	cancel       chan struct{}

-	canceled     bool

-}

-

-// New returns a new RestartManager based on a policy.

-func New(policy container.RestartPolicy, restartCount int) *RestartManager {

-	return &RestartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})}

-}

-

-// SetPolicy sets the restart-policy for the RestartManager.

-func (rm *RestartManager) SetPolicy(policy container.RestartPolicy) {

-	rm.Lock()

-	rm.policy = policy

-	rm.Unlock()

-}

-

-// ShouldRestart returns whether the container should be restarted.

-func (rm *RestartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool, executionDuration time.Duration) (bool, chan error, error) {

-	if rm.policy.IsNone() {

-		return false, nil, nil

-	}

-	rm.Lock()

-	unlockOnExit := true

-	defer func() {

-		if unlockOnExit {

-			rm.Unlock()

-		}

-	}()

-

-	if rm.canceled {

-		return false, nil, ErrRestartCanceled

-	}

-

-	if rm.active {

-		return false, nil, errors.New("invalid call on an active restart manager")

-	}

-	// if the container ran for more than 10s, regardless of status and policy reset

-	// the timeout back to the default.

-	if executionDuration.Seconds() >= 10 {

-		rm.timeout = 0

-	}

-	switch {

-	case rm.timeout == 0:

-		rm.timeout = defaultTimeout

-	case rm.timeout < maxRestartTimeout:

-		rm.timeout *= backoffMultiplier

-	}

-	if rm.timeout > maxRestartTimeout {

-		rm.timeout = maxRestartTimeout

-	}

-

-	var restart bool

-	switch {

-	case rm.policy.IsAlways():

-		restart = true

-	case rm.policy.IsUnlessStopped() && !hasBeenManuallyStopped:

-		restart = true

-	case rm.policy.IsOnFailure():

-		// the default value of 0 for MaximumRetryCount means that we will not enforce a maximum count

-		if maxRetryCount := rm.policy.MaximumRetryCount; maxRetryCount == 0 || rm.restartCount < maxRetryCount {

-			restart = exitCode != 0

-		}

-	}

-

-	if !restart {

-		rm.active = false

-		return false, nil, nil

-	}

-

-	rm.restartCount++

-

-	unlockOnExit = false

-	rm.active = true

-	rm.Unlock()

-

-	ch := make(chan error)

-	go func() {

-		timeout := time.NewTimer(rm.timeout)

-		defer timeout.Stop()

-

-		select {

-		case <-rm.cancel:

-			ch <- ErrRestartCanceled

-			close(ch)

-		case <-timeout.C:

-			rm.Lock()

-			close(ch)

-			rm.active = false

-			rm.Unlock()

-		}

-	}()

-

-	return true, ch, nil

-}

-

-// Cancel tells the RestartManager to no longer restart the container.

-func (rm *RestartManager) Cancel() {

-	rm.Do(func() {

-		rm.Lock()

-		rm.canceled = true

-		close(rm.cancel)

-		rm.Unlock()

-	})

-}

deleted file mode 100644

@@ -1,36 +0,0 @@

-package restartmanager

-

-import (

-	"testing"

-	"time"

-

-	"github.com/docker/docker/api/types/container"

-)

-

-func TestRestartManagerTimeout(t *testing.T) {

-	rm := New(container.RestartPolicy{Name: "always"}, 0)

-	duration := 1 * time.Second

-	should, _, err := rm.ShouldRestart(0, false, duration)

-	if err != nil {

-		t.Fatal(err)

-	}

-	if !should {

-		t.Fatal("container should be restarted")

-	}

-	if rm.timeout != defaultTimeout {

-		t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)

-	}

-}

-

-func TestRestartManagerTimeoutReset(t *testing.T) {

-	rm := New(container.RestartPolicy{Name: "always"}, 0)

-	rm.timeout = 5 * time.Second

-	duration := 10 * time.Second

-	_, _, err := rm.ShouldRestart(0, false, duration)

-	if err != nil {

-		t.Fatal(err)

-	}

-	if rm.timeout != defaultTimeout {

-		t.Fatalf("restart manager should have a timeout of 100 ms but has %s", rm.timeout)

-	}

-}