From 2edd084814bd450c0bfb14915bb9bc3ce96498eb Mon Sep 17 00:00:00 2001
From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Thu, 18 Jan 2018 16:40:59 -0500
Subject: [PATCH] 12891: Don't give up after trying once to stop the docker
 container.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---
 services/crunch-run/crunchrun.go | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 1bd49569d3..b8c80dd247 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -150,11 +150,10 @@ func (runner *ContainerRunner) setupSignals() {
 	signal.Notify(runner.SigChan, syscall.SIGQUIT)
 
 	go func(sig chan os.Signal) {
-		s := <-sig
-		if s != nil {
-			runner.CrunchLog.Printf("Caught signal %v", s)
+		for s := range sig {
+			runner.CrunchLog.Printf("caught signal: %v", s)
+			runner.stop()
 		}
-		runner.stop()
 	}(runner.SigChan)
 }
 
@@ -162,25 +161,21 @@ func (runner *ContainerRunner) setupSignals() {
 func (runner *ContainerRunner) stop() {
 	runner.cStateLock.Lock()
 	defer runner.cStateLock.Unlock()
-	if runner.cCancelled {
+	if !runner.cStarted {
 		return
 	}
 	runner.cCancelled = true
-	if runner.cStarted {
-		timeout := time.Duration(10)
-		err := runner.Docker.ContainerStop(context.TODO(), runner.ContainerID, &(timeout))
-		if err != nil {
-			runner.CrunchLog.Printf("StopContainer failed: %s", err)
-		}
-		// Suppress multiple calls to stop()
-		runner.cStarted = false
+	runner.CrunchLog.Printf("stopping container")
+	timeout := 10 * time.Second
+	err := runner.Docker.ContainerStop(context.TODO(), runner.ContainerID, &timeout)
+	if err != nil {
+		runner.CrunchLog.Printf("error stopping container: %s", err)
 	}
 }
 
 func (runner *ContainerRunner) stopSignals() {
 	if runner.SigChan != nil {
 		signal.Stop(runner.SigChan)
-		close(runner.SigChan)
 	}
 }
 
-- 
2.30.2