Merge pull request #868 from pvanheus/random_output_dir

Add random outdir support

Author: mr-c

cwltool/command_line_tool.py

@@ -47,7 +47,7 @@
 from .stdfsaccess import StdFsAccess  # pylint: disable=unused-import
 from .utils import (aslist, convert_pathsep_to_unix,
                     docker_windows_path_adjust, json_dumps, onWindows,
-                    windows_default_container_id)
+                    random_outdir, windows_default_container_id)
 if TYPE_CHECKING:
     from .provenance import CreateProvProfile  # pylint: disable=unused-import
 
@@ -357,7 +357,7 @@ def job(self,
 
             if os.path.isdir(jobcache) and not os.path.isfile(jobcachepending):
                 if docker_req and runtimeContext.use_container:
-                    cachebuilder.outdir = runtimeContext.docker_outdir or "/var/spool/cwl"
+                    cachebuilder.outdir = runtimeContext.docker_outdir or random_outdir()
                 else:
                     cachebuilder.outdir = jobcache
 

cwltool/process.py

@@ -45,7 +45,7 @@
     DependenciesConfiguration)
 from .stdfsaccess import StdFsAccess
 from .utils import (DEFAULT_TMP_PREFIX, aslist, cmp_like_py2,
-                    copytree_with_merge, onWindows)
+                    copytree_with_merge, onWindows, random_outdir)
 from .validate_js import validate_js_expressions
 try:
     from os import scandir  # type: ignore
@@ -644,9 +644,9 @@ def _init_job(self, joborder, runtimeContext):
                     outdir = dockerReq.get("dockerOutputDirectory")
                 else:
                     outdir = dockerReq.get("dockerOutputDirectory") or \
-                        runtimeContext.docker_outdir or "/var/spool/cwl"
+                        runtimeContext.docker_outdir or random_outdir()
             elif defaultDocker:
-                outdir = runtimeContext.docker_outdir or "/var/spool/cwl"
+                outdir = runtimeContext.docker_outdir or random_outdir()
             tmpdir = runtimeContext.docker_tmpdir or "/tmp"
             stagedir = runtimeContext.docker_stagedir or "/var/lib/cwl"
         else:

cwltool/utils.py

@@ -4,7 +4,9 @@
 import collections
 import os
 import platform
+import random
 import shutil
+import string
 import sys
 from functools import partial  # pylint: disable=unused-import
 from typing import (IO, Any, AnyStr, Callable,  # pylint: disable=unused-import
@@ -209,3 +211,10 @@ def visit_class(rec, cls, op):
     if isinstance(rec, MutableSequence):
         for d in rec:
             visit_class(d, cls, op)
+
+def random_outdir():  # type: () -> Text
+    """ Return the random directory name chosen to use for tool / workflow output """
+    # compute this once and store it as a function attribute - each subsequent call will return the same value
+    if not hasattr(random_outdir, 'outdir'):
+        random_outdir.outdir = '/' + ''.join([random.choice(string.ascii_letters) for _ in range(6)])  # type: ignore
+    return random_outdir.outdir  # type: ignore