1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Grab a lock to read container.RemovalInProgress

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
This commit is contained in:
Fabio Kung 2017-02-21 15:55:59 -08:00
parent 8a672ba1aa
commit 481a92cb41

View file

@ -271,6 +271,7 @@ func (daemon *Daemon) restore() error {
}
}
c.Lock()
if c.RemovalInProgress {
// We probably crashed in the middle of a removal, reset
// the flag.
@ -281,10 +282,11 @@ func (daemon *Daemon) restore() error {
// be removed. So we put the container in the "dead"
// state and leave further processing up to them.
logrus.Debugf("Resetting RemovalInProgress flag from %v", c.ID)
c.ResetRemovalInProgress()
c.SetDead()
c.RemovalInProgress = false
c.Dead = true
c.ToDisk()
}
c.Unlock()
}(c)
}
wg.Wait()