X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c1ea9a2fdccc5e24554f8cf28296cbc0764c8bbc..c64d7e1d5d1879187e1c4002445fab1d3c7951a0:/services/crunch-run/crunchrun.go

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index fd2ce3f659..c6847bc19d 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -145,6 +145,7 @@ type ContainerRunner struct {
 	HostOutputDir  string
 	CleanupTempDir []string
 	Binds          []string
+	Volumes        map[string]struct{}
 	OutputPDH      *string
 	SigChan        chan os.Signal
 	ArvMountExit   chan error
@@ -336,6 +337,7 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 
 	collectionPaths := []string{}
 	runner.Binds = nil
+	runner.Volumes = make(map[string]struct{})
 	needCertMount := true
 
 	var binds []string
@@ -428,24 +430,25 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 			}
 			collectionPaths = append(collectionPaths, src)
 
-		case mnt.Kind == "tmp" && bind == runner.Container.OutputPath:
-			runner.HostOutputDir, err = runner.MkTempDir("", "")
+		case mnt.Kind == "tmp":
+			var tmpdir string
+			tmpdir, err = runner.MkTempDir("", "")
 			if err != nil {
 				return fmt.Errorf("While creating mount temp dir: %v", err)
 			}
-			st, staterr := os.Stat(runner.HostOutputDir)
+			st, staterr := os.Stat(tmpdir)
 			if staterr != nil {
 				return fmt.Errorf("While Stat on temp dir: %v", staterr)
 			}
-			err = os.Chmod(runner.HostOutputDir, st.Mode()|os.ModeSetgid|0777)
+			err = os.Chmod(tmpdir, st.Mode()|os.ModeSetgid|0777)
 			if staterr != nil {
 				return fmt.Errorf("While Chmod temp dir: %v", err)
 			}
-			runner.CleanupTempDir = append(runner.CleanupTempDir, runner.HostOutputDir)
-			runner.Binds = append(runner.Binds, fmt.Sprintf("%s:%s", runner.HostOutputDir, bind))
-
-		case mnt.Kind == "tmp":
-			runner.Binds = append(runner.Binds, bind)
+			runner.CleanupTempDir = append(runner.CleanupTempDir, tmpdir)
+			runner.Binds = append(runner.Binds, fmt.Sprintf("%s:%s", tmpdir, bind))
+			if bind == runner.Container.OutputPath {
+				runner.HostOutputDir = tmpdir
+			}
 
 		case mnt.Kind == "json":
 			jsondata, err := json.Marshal(mnt.Content)
@@ -793,6 +796,8 @@ func (runner *ContainerRunner) CreateContainer() error {
 		runner.ContainerConfig.Env = append(runner.ContainerConfig.Env, k+"="+v)
 	}
 
+	runner.ContainerConfig.Volumes = runner.Volumes
+
 	runner.HostConfig = dockercontainer.HostConfig{
 		Binds:  runner.Binds,
 		Cgroup: dockercontainer.CgroupSpec(runner.setCgroupParent),