rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-24 12:58:56 +00:00
Code Issues Releases Wiki Activity

Fix timing issue with etcd snapshot

Browse Source
This commit is contained in:
galal-hussein
2018-06-29 01:56:15 +02:00
committed by Alena Prokharchyk
parent 8a52e0d8dc
commit a67b5e1d84
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/docker.go
View File

@@ -10,6 +10,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "strings"
"time"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
ref "github.com/docker/distribution/reference" ref "github.com/docker/distribution/reference"
@@ -24,6 +25,7 @@ import (
const ( const (
DockerRegistryURL = "docker.io" DockerRegistryURL = "docker.io"
RestartTimeout = 30
) )
var K8sDockerVersions = map[string][]string{ var K8sDockerVersions = map[string][]string{
@@ -53,6 +55,14 @@ func DoRunContainer(ctx context.Context, dClient *client.Client, imageCfg *conta
} }
// Check for upgrades // Check for upgrades
if container.State.Running { if container.State.Running {
// check if container is in a restarting loop
if container.State.Restarting {
logrus.Debugf("[%s] Container [%s] is in a restarting loop [%s]", plane, containerName, hostname)
restartTimeoutDuration := RestartTimeout * time.Second
if err := dClient.ContainerRestart(ctx, container.ID, &restartTimeoutDuration); err != nil {
return fmt.Errorf("Failed to start [%s] container on host [%s]: %v", containerName, hostname, err)
}
}
logrus.Debugf("[%s] Container [%s] is already running on host [%s]", plane, containerName, hostname) logrus.Debugf("[%s] Container [%s] is already running on host [%s]", plane, containerName, hostname)
isUpgradable, err := IsContainerUpgradable(ctx, dClient, imageCfg, containerName, hostname, plane) isUpgradable, err := IsContainerUpgradable(ctx, dClient, imageCfg, containerName, hostname, plane)
if err != nil { if err != nil {