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

Fix data race in libcontainerd

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 8e9fbc8f5f)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-07-13 10:04:42 -07:00 committed by Tibor Vass
parent 5bb9640ab8
commit ec03307eb2

View file

@ -143,8 +143,8 @@ func (r *remote) handleConnectionChange() {
transientFailureCount = 0 transientFailureCount = 0
if utils.IsProcessAlive(r.daemonPid) { if utils.IsProcessAlive(r.daemonPid) {
utils.KillProcess(r.daemonPid) utils.KillProcess(r.daemonPid)
<-r.daemonWaitCh
} }
<-r.daemonWaitCh
if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error
logrus.Errorf("error restarting containerd: %v", err) logrus.Errorf("error restarting containerd: %v", err)
} }