From 8e9fbc8f5fc5759eb7f26ec998f227994ff6c642 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Wed, 13 Jul 2016 10:04:42 -0700
Subject: [PATCH] Fix data race in libcontainerd

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 libcontainerd/remote_linux.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
index 5f4e812cfb..424361c899 100644
--- 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)
 					}