Fix data race in libcontainerd

Signed-off-by: Kenfe-Mickael Laventure <[email protected]>
mtanlee · Jul 13, 2016 · 8e9fbc8 · 8e9fbc8
1 parent 8a40546
commit 8e9fbc8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
@@ -142,8 +142,8 @@ func (r *remote) handleConnectionChange() {
 					transientFailureCount = 0
 					if utils.IsProcessAlive(r.daemonPid) {
 						utils.KillProcess(r.daemonPid)
-						<-r.daemonWaitCh
 					}
+					<-r.daemonWaitCh
 					if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error
 						logrus.Errorf("error restarting containerd: %v", err)
 					}