X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/482dc81f2b7533043bc5195bded942f970f163d8..358b9e8cb0fb72db4f7c8966de175fbadca9adeb:/services/crunch-run/crunchrun.go?ds=sidebyside

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index d804c01cad..ade40c6b03 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -250,6 +250,11 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 	pdhOnly := true
 	tmpcount := 0
 	arvMountCmd := []string{"--foreground", "--allow-other", "--read-write"}
+
+	if runner.Container.RuntimeConstraints.KeepCacheRAM > 0 {
+		arvMountCmd = append(arvMountCmd, "--file-cache", fmt.Sprintf("%d", runner.Container.RuntimeConstraints.KeepCacheRAM))
+	}
+
 	collectionPaths := []string{}
 	runner.Binds = nil
 
@@ -563,6 +568,21 @@ func (runner *ContainerRunner) CaptureOutput() error {
 		return nil
 	}
 
+	if wantAPI := runner.Container.RuntimeConstraints.API; wantAPI != nil && *wantAPI {
+		// Output may have been set directly by the container, so
+		// refresh the container record to check.
+		err := runner.ArvClient.Get("containers", runner.Container.UUID,
+			nil, &runner.Container)
+		if err != nil {
+			return err
+		}
+		if runner.Container.Output != "" {
+			// Container output is already set.
+			runner.OutputPDH = &runner.Container.Output
+			return nil
+		}
+	}
+
 	if runner.HostOutputDir == "" {
 		return nil
 	}