[ARVADOS] created: 1042f200521bed5c9bb658d24afc442d552a76fa

[Git user]

        at  1042f200521bed5c9bb658d24afc442d552a76fa (commit)


commit 1042f200521bed5c9bb658d24afc442d552a76fa
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Feb 24 17:29:00 2017 -0500

    10777: Stop container if arv-mount dies before container exits.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 0b59f7d..267abca 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -5,12 +5,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"git.curoverse.com/arvados.git/lib/crunchstat"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
-	"git.curoverse.com/arvados.git/sdk/go/manifest"
-	"github.com/curoverse/dockerclient"
 	"io"
 	"io/ioutil"
 	"log"
@@ -24,6 +18,13 @@ import (
 	"sync"
 	"syscall"
 	"time"
+
+	"git.curoverse.com/arvados.git/lib/crunchstat"
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"git.curoverse.com/arvados.git/sdk/go/manifest"
+	"github.com/curoverse/dockerclient"
 )
 
 // IArvadosClient is the minimal Arvados API methods used by crunch-run.
@@ -125,18 +126,27 @@ func (runner *ContainerRunner) SetupSignals() {
 
 	go func(sig <-chan os.Signal) {
 		for range sig {
-			if !runner.Cancelled {
-				runner.CancelLock.Lock()
-				runner.Cancelled = true
-				if runner.ContainerID != "" {
-					runner.Docker.StopContainer(runner.ContainerID, 10)
-				}
-				runner.CancelLock.Unlock()
-			}
+			runner.stop()
 		}
 	}(runner.SigChan)
 }
 
+// stop the underlying Docker container.
+func (runner *ContainerRunner) stop() {
+	runner.CancelLock.Lock()
+	defer runner.CancelLock.Unlock()
+	if runner.Cancelled {
+		return
+	}
+	runner.Cancelled = true
+	if runner.ContainerID != "" {
+		err := runner.Docker.StopContainer(runner.ContainerID, 10)
+		if err != nil {
+			log.Printf("StopContainer failed: %s", err)
+		}
+	}
+}
+
 // LoadImage determines the docker image id from the container record and
 // checks if it is available in the local Docker image store.  If not, it loads
 // the image from Keep.
@@ -600,12 +610,22 @@ func (runner *ContainerRunner) StartContainer() error {
 func (runner *ContainerRunner) WaitFinish() error {
 	runner.CrunchLog.Print("Waiting for container to finish")
 
-	result := runner.Docker.Wait(runner.ContainerID)
-	wr := <-result
-	if wr.Error != nil {
-		return fmt.Errorf("While waiting for container to finish: %v", wr.Error)
+	waitDocker := runner.Docker.Wait(runner.ContainerID)
+	waitMount := runner.ArvMountExit
+	for waitDocker != nil {
+		select {
+		case err := <-waitMount:
+			log.Printf("arv-mount exited before container finished: %v", err)
+			waitMount = nil
+			runner.stop()
+		case wr := <-waitDocker:
+			if wr.Error != nil {
+				return fmt.Errorf("While waiting for container to finish: %v", wr.Error)
+			}
+			runner.ExitCode = &wr.ExitCode
+			waitDocker = nil
+		}
 	}
-	runner.ExitCode = &wr.ExitCode
 
 	// wait for stdout/stderr to complete
 	<-runner.loggingDone

-----------------------------------------------------------------------


hooks/post-receive
--