[arvados] updated: 2.1.0-2968-gc10bd6ad5

git repository hosting git at public.arvados.org
Tue Oct 25 15:58:46 UTC 2022


Summary of changes:
 lib/crunchrun/crunchrun.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  c10bd6ad576a5dd1f7ededa9df6361003cd5ebd1 (commit)
      from  c453e7667a87053ebc34d70c44995e116601cb93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c10bd6ad576a5dd1f7ededa9df6361003cd5ebd1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Oct 25 11:58:30 2022 -0400

    18842: Fix syntax errors & error handling
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 67454cd0f..7d57d732d 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -428,10 +428,12 @@ func (runner *ContainerRunner) SetupMounts() (map[string]bindmount, error) {
 	}
 
 	if runner.Container.RuntimeConstraints.KeepCacheDisk > 0 {
-		keepcachedir, err = runner.MkTempDir(runner.parentTemp, "keepcache")
+		keepcachedir, err := runner.MkTempDir(runner.parentTemp, "keepcache")
+		if err != nil {
+			return nil, fmt.Errorf("while creating keep cache temp dir: %v", err)
+		}
 		arvMountCmd = append(arvMountCmd, "--disk-cache", "--disk-cache-dir", keepcachedir, "--file-cache", fmt.Sprintf("%d", runner.Container.RuntimeConstraints.KeepCacheDisk))
-	}
-	else if runner.Container.RuntimeConstraints.KeepCacheRAM > 0 {
+	} else if runner.Container.RuntimeConstraints.KeepCacheRAM > 0 {
 		arvMountCmd = append(arvMountCmd, "--file-cache", fmt.Sprintf("%d", runner.Container.RuntimeConstraints.KeepCacheRAM))
 	}
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list