From: Tom Clegg <tom@curii.com>
Date: Fri, 3 Sep 2021 14:29:05 +0000 (-0400)
Subject: 18027: Kill arv-mount directly if arv-mount --unmount cannot run.
X-Git-Tag: 2.3.0~79^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/22102137c1e5eda8543c79d30d963ceb9e9a47af

18027: Kill arv-mount directly if arv-mount --unmount cannot run.

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