Do not lock all containers during pod kill

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #600
Approved by: rhatdan

1 files changed, 8 insertions, 8 deletions

diff --git a/libpod/pod.go b/libpod/pod.go
index e6a2ba3dc..2126e9228 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -298,26 +298,26 @@ func (p *Pod) Kill(signal uint) (map[string]error, error) {
 		return nil, err
 	}
 
-	// We need to lock all the containers
+	ctrErrors := make(map[string]error)
+
+	// Send a signal to all containers
 	for _, ctr := range allCtrs {
 		ctr.lock.Lock()
-		defer ctr.lock.Unlock()
 
 		if err := ctr.syncContainer(); err != nil {
-			return nil, err
+			ctr.lock.Unlock()
+			ctrErrors[ctr.ID()] = err
+			continue
 		}
-	}
-
-	ctrErrors := make(map[string]error)
 
-	// Send a signal to all containers
-	for _, ctr := range allCtrs {
 		// Ignore containers that are not running
 		if ctr.state.State != ContainerStateRunning {
+			ctr.lock.Unlock()
 			continue
 		}
 
 		if err := ctr.runtime.ociRuntime.killContainer(ctr, signal); err != nil {
+			ctr.lock.Unlock()
 			ctrErrors[ctr.ID()] = err
 			continue
 		}