[ARVADOS] created: 2.1.0-1281-g22102137c

[Git user]

        at  22102137c1e5eda8543c79d30d963ceb9e9a47af (commit)


commit 22102137c1e5eda8543c79d30d963ceb9e9a47af
Author: Tom Clegg <tom at curii.com>
Date:   Fri Sep 3 10:29:05 2021 -0400

    18027: Kill arv-mount directly if arv-mount --unmount cannot run.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index e15303a31..01141674a 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

commit 9ce401977e4462751e8fa0f825d1a95b17116371
Author: Tom Clegg <tom at curii.com>
Date:   Fri Sep 3 10:26:36 2021 -0400

    18027: Fix crash when reporting error during --unmount.
    
    Traceback (most recent call last):
      File "/usr/bin/arv-mount", line 10, in <module>
        arvados_fuse.command.Mount(args).run()
      File "/usr/share/python3/dist/python3-arvados-fuse/lib/python3.7/site-packages/arvados_fuse/command.py", line 172, in run
        recursive=self.args.unmount_all)
      File "/usr/share/python3/dist/python3-arvados-fuse/lib/python3.7/site-packages/arvados_fuse/unmount.py", line 162, in unmount
        sys.stderr.write(fusermount_output)
    TypeError: write() argument must be str, not bytes
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/fuse/arvados_fuse/unmount.py b/services/fuse/arvados_fuse/unmount.py
index dbfea1f90..12d047a8f 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:

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


hooks/post-receive
--