X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6766d1b04bd238d05890f3ec221c65e84920dde6..cf4c25824e15e3b9a7c1439ab3aff17d8be52630:/lib/crunchrun/crunchrun.go

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 59ef73e65a..01141674a6 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -260,18 +260,16 @@ func (runner *ContainerRunner) LoadImage() (string, error) {
 		return "", fmt.Errorf("cannot choose from multiple tar files in image collection: %v", tarfiles)
 	}
 	imageID := tarfiles[0][:len(tarfiles[0])-4]
-	imageFile := runner.ArvMountPoint + "/by_id/" + runner.Container.ContainerImage + "/" + tarfiles[0]
+	imageTarballPath := runner.ArvMountPoint + "/by_id/" + runner.Container.ContainerImage + "/" + imageID + ".tar"
 	runner.CrunchLog.Printf("Using Docker image id %q", imageID)
 
-	if !runner.executor.ImageLoaded(imageID) {
-		runner.CrunchLog.Print("Loading Docker image from keep")
-		err = runner.executor.LoadImage(imageFile)
-		if err != nil {
-			return "", err
-		}
-	} else {
-		runner.CrunchLog.Print("Docker image is available")
+	runner.CrunchLog.Print("Loading Docker image from keep")
+	err = runner.executor.LoadImage(imageID, imageTarballPath, runner.Container, runner.ArvMountPoint,
+		runner.containerClient)
+	if err != nil {
+		return "", err
 	}
+
 	return imageID, nil
 }
 
@@ -599,6 +597,7 @@ func (runner *ContainerRunner) SetupMounts() (map[string]bindmount, error) {
 	} else {
 		arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_id")
 	}
+	arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_uuid")
 	arvMountCmd = append(arvMountCmd, runner.ArvMountPoint)
 
 	runner.ArvMount, err = runner.RunArvMount(arvMountCmd, token)
@@ -1171,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
@@ -1201,12 +1201,14 @@ func (runner *ContainerRunner) CleanupDirs() {
 				}
 			}
 		}
+		runner.ArvMount = nil
 	}
 
 	if runner.ArvMountPoint != "" {
 		if rmerr := os.Remove(runner.ArvMountPoint); rmerr != nil {
 			runner.CrunchLog.Printf("While cleaning up arv-mount directory %s: %v", runner.ArvMountPoint, rmerr)
 		}
+		runner.ArvMountPoint = ""
 	}
 
 	if rmerr := os.RemoveAll(runner.parentTemp); rmerr != nil {
@@ -1441,6 +1443,7 @@ func (runner *ContainerRunner) Run() (err error) {
 		}
 		checkErr("stopHoststat", runner.stopHoststat())
 		checkErr("CommitLogs", runner.CommitLogs())
+		runner.CleanupDirs()
 		checkErr("UpdateContainerFinal", runner.UpdateContainerFinal())
 	}()
 
@@ -1559,8 +1562,6 @@ func (runner *ContainerRunner) fetchContainerRecord() error {
 	}
 	runner.SecretMounts = sm.SecretMounts
 
-	runner.executor.SetArvadoClient(runner.containerClient, runner.Container)
-
 	return nil
 }