From: Tom Clegg <tom@curii.com>
Date: Thu, 9 Sep 2021 15:35:52 +0000 (-0400)
Subject: Merge branch '18027-unmount-fuse'
X-Git-Tag: 2.3.0~79
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/055b9792b7692d6c42f4e13d38dc6cd008396a6f?hp=834f7c726f727e04250ed6b3eda287ca996e9c38

Merge branch '18027-unmount-fuse'

refs #18027

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index e15303a315..01141674a6 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1170,6 +1170,7 @@ func (runner *ContainerRunner) CleanupDirs() {
 
 		if umnterr != nil {
 			runner.CrunchLog.Printf("Error unmounting: %v", umnterr)
+			runner.ArvMount.Process.Kill()
 		} else {
 			// If arv-mount --unmount gets stuck for any reason, we
 			// don't want to wait for it forever.  Do Wait() in a goroutine
diff --git a/services/fuse/arvados_fuse/unmount.py b/services/fuse/arvados_fuse/unmount.py
index dbfea1f904..12d047a8f3 100644
--- a/services/fuse/arvados_fuse/unmount.py
+++ b/services/fuse/arvados_fuse/unmount.py
@@ -159,7 +159,7 @@ def unmount(path, subtype=None, timeout=10, recursive=False):
         if attempted:
             # Report buffered stderr from previous call to fusermount,
             # now that we know it didn't succeed.
-            sys.stderr.write(fusermount_output)
+            sys.stderr.buffer.write(fusermount_output)
 
             delay = 1
             if deadline: