docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1707 from vieux/improve_logs_and_lock 

Improve logs and fix lock in engine
This commit is contained in:
Chanwit Kaewkasi 2016-01-30 04:02:50 +07:00
parent f08f47044e 25b61791a5
commit 1fa6cd9c55
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/engine.go
View File

@ -721,10 +721,10 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool, au
e.RefreshVolumes()
e.RefreshNetworks()
e.RLock()
defer e.RUnlock()
e.Lock()
container := e.containers[id]
e.Unlock()
if container == nil {
err = errors.New("Container created but refresh didn't report it back")
}

5
cluster/watchdog.go
View File

@ -76,12 +76,13 @@ func (w *Watchdog) rescheduleContainers(e *Engine) {
newContainer, err := w.cluster.CreateContainer(c.Config, c.Info.Name, nil)
if err != nil {
log.Errorf("Failed to reschedule container %s (Swarm ID: %s): %v", c.Id, c.Config.SwarmID(), err)
log.Errorf("Failed to reschedule container %s: %v", c.Id, err)
// add the container back, so we can retry later
c.Engine.AddContainer(c)
} else {
log.Infof("Rescheduled container %s from %s to %s as %s (Swarm ID: %s)", c.Id, c.Engine.ID, newContainer.Engine.ID, newContainer.Id, c.Config.SwarmID())
log.Infof("Rescheduled container %s from %s to %s as %s", c.Id, c.Engine.Name, newContainer.Engine.Name, newContainer.Id)
if c.Info.State.Running {
log.Infof("Container %s was running, starting container %s", c.Id, newContainer.Id)
if err := newContainer.Start(); err != nil {
log.Errorf("Failed to start rescheduled container %s", newContainer.Id)
}