From: Peter Amstutz <peter.amstutz@curii.com>
Date: Wed, 25 Aug 2021 19:34:04 +0000 (-0400)
Subject: Merge branch '17755-singularity-race' into main refs #17755
X-Git-Tag: 2.3.0~99
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d59079ca2a8e1afb3cf02bd9908c2cfe4c025d4f?hp=c340eecc7a03dd066792e5f046f087b8b3dfced6

Merge branch '17755-singularity-race' into main refs #17755

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 741f542454..61fecad0a1 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -101,7 +101,7 @@ func (e *singularityExecutor) checkImageCache(dockerImageID string, container ar
 	if len(cl.Items) == 1 {
 		imageCollection = cl.Items[0]
 	} else {
-		collectionName := collectionName + " " + time.Now().UTC().Format(time.RFC3339)
+		collectionName := "converting " + collectionName
 		exp := time.Now().Add(24 * 7 * 2 * time.Hour)
 		err = containerClient.RequestAndDecode(&imageCollection,
 			arvados.EndpointCollectionCreate.Method,
@@ -112,6 +112,7 @@ func (e *singularityExecutor) checkImageCache(dockerImageID string, container ar
 					"name":       collectionName,
 					"trash_at":   exp.UTC().Format(time.RFC3339),
 				},
+				"ensure_unique_name": true,
 			})
 		if err != nil {
 			return nil, fmt.Errorf("error creating '%v' collection: %s", collectionName, err)
@@ -141,6 +142,12 @@ func (e *singularityExecutor) LoadImage(dockerImageID string, imageTarballPath s
 	}
 
 	if _, err := os.Stat(imageFilename); os.IsNotExist(err) {
+		// Make sure the docker image is readable, and error
+		// out if not.
+		if _, err := os.Stat(imageTarballPath); err != nil {
+			return err
+		}
+
 		e.logf("building singularity image")
 		// "singularity build" does not accept a
 		// docker-archive://... filename containing a ":" character,