rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-16 16:31:07 +00:00
Code Issues Releases Wiki Activity

Add stop container timeout

Browse Source
This commit is contained in:
galal-hussein 2018-09-20 18:55:29 +02:00 committed by Alena Prokharchyk
parent 95ba4ea61f
commit be7bc526ab
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/docker.go
View File

@ -27,7 +27,10 @@ import (
const ( const (
DockerRegistryURL = "docker.io" DockerRegistryURL = "docker.io"
RestartTimeout = 30 // RestartTimeout in seconds
RestartTimeout = 30
// StopTimeout in seconds
StopTimeout = 30
) )
var K8sDockerVersions = map[string][]string{ var K8sDockerVersions = map[string][]string{
@ -136,12 +139,6 @@ func DoRemoveContainer(ctx context.Context, dClient *client.Client, containerNam
} }
return err return err
} }
logrus.Debugf("[remove/%s] Stopping container on host [%s]", containerName, hostname)
err = StopContainer(ctx, dClient, hostname, containerName)
if err != nil {
return err
}
logrus.Debugf("[remove/%s] Removing container on host [%s]", containerName, hostname) logrus.Debugf("[remove/%s] Removing container on host [%s]", containerName, hostname)
err = RemoveContainer(ctx, dClient, hostname, containerName) err = RemoveContainer(ctx, dClient, hostname, containerName)
if err != nil { if err != nil {
@ -225,7 +222,7 @@ func UseLocalOrPull(ctx context.Context, dClient *client.Client, hostname string
} }
func RemoveContainer(ctx context.Context, dClient *client.Client, hostname string, containerName string) error { func RemoveContainer(ctx context.Context, dClient *client.Client, hostname string, containerName string) error {
err := dClient.ContainerRemove(ctx, containerName, types.ContainerRemoveOptions{}) err := dClient.ContainerRemove(ctx, containerName, types.ContainerRemoveOptions{Force: true})
if err != nil { if err != nil {
return fmt.Errorf("Can't remove Docker container [%s] for host [%s]: %v", containerName, hostname, err) return fmt.Errorf("Can't remove Docker container [%s] for host [%s]: %v", containerName, hostname, err)
} }
@ -233,7 +230,9 @@ func RemoveContainer(ctx context.Context, dClient *client.Client, hostname strin
} }
func StopContainer(ctx context.Context, dClient *client.Client, hostname string, containerName string) error { func StopContainer(ctx context.Context, dClient *client.Client, hostname string, containerName string) error {
err := dClient.ContainerStop(ctx, containerName, nil) // define the stop timeout
stopTimeoutDuration := StopTimeout * time.Second
err := dClient.ContainerStop(ctx, containerName, &stopTimeoutDuration)
if err != nil { if err != nil {
return fmt.Errorf("Can't stop Docker container [%s] for host [%s]: %v", containerName, hostname, err) return fmt.Errorf("Can't stop Docker container [%s] for host [%s]: %v", containerName, hostname, err)
} }