[ARVADOS] created: 1.1.0-98-ga7d2dbf

[Git user]

        at  a7d2dbf5e121868dc8c687b5effdca392dbf7bfb (commit)


commit a7d2dbf5e121868dc8c687b5effdca392dbf7bfb
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Nov 2 17:52:58 2017 -0400

    Force kill arv-mount wip
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 3678bd8..a424088 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -182,6 +182,7 @@ type ContainerRunner struct {
 
 	enableNetwork string // one of "default" or "always"
 	networkMode   string // passed through to HostConfig.NetworkMode
+	arvMountKill  func()
 }
 
 // setupSignals sets up signal handling to gracefully terminate the underlying
@@ -300,6 +301,10 @@ func (runner *ContainerRunner) ArvMountCmd(arvMountCmd []string, token string) (
 		return nil, err
 	}
 
+	runner.arvMountKill = func() {
+		c.Process.Kill()
+	}
+
 	statReadme := make(chan bool)
 	runner.ArvMountExit = make(chan error)
 
@@ -1237,15 +1242,26 @@ func (runner *ContainerRunner) getCollectionManifestForPath(mnt arvados.Mount, b
 
 func (runner *ContainerRunner) CleanupDirs() {
 	if runner.ArvMount != nil {
-		umount := exec.Command("fusermount", "-z", "-u", runner.ArvMountPoint)
+		//umount := exec.Command("fusermount", "-u", runner.ArvMountPoint)
+		umount := exec.Command("sleep", "1")
 		umnterr := umount.Run()
 		if umnterr != nil {
-			runner.CrunchLog.Printf("While running fusermount: %v", umnterr)
+			log.Printf("While running fusermount: %v", umnterr)
 		}
-
-		mnterr := <-runner.ArvMountExit
-		if mnterr != nil {
-			runner.CrunchLog.Printf("Arv-mount exit error: %v", mnterr)
+		timeout := time.NewTimer(10 * time.Second)
+		select {
+		case mnterr := <-runner.ArvMountExit:
+			if mnterr != nil {
+				log.Printf("Arv-mount exit error: %v", mnterr)
+			}
+		case <-timeout.C:
+			log.Printf("Timeout waiting for arv-mount to end.  Killing arv-mount.")
+			runner.arvMountKill()
+			umount = exec.Command("arv-mount", "--unmount-timeout=10", "--unmount", runner.ArvMountPoint)
+			umnterr = umount.Run()
+			if umnterr != nil {
+				log.Printf("While running arv-mount --unmount: %v", umnterr)
+			}
 		}
 	}
 

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


hooks/post-receive
--