X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/78317dade4e29b06f1f83b16603cc8ef5c42c434..b4dde1b5648aa71180282b7dfa0fc70ba7c87755:/crunch_scripts/run-command

diff --git a/crunch_scripts/run-command b/crunch_scripts/run-command
index 48c8b5821d..74ad8a87fc 100755
--- a/crunch_scripts/run-command
+++ b/crunch_scripts/run-command
@@ -113,7 +113,7 @@ def get_items(p, value):
             items = ["$(dir %s/%s/)" % (prefix, l) for l in os.listdir(fn)]
         elif stat.S_ISREG(mode):
             with open(fn) as f:
-                items = [line for line in f]
+                items = [line.rstrip("\r\n") for line in f]
         return items
     else:
         return None
@@ -124,33 +124,50 @@ stdinname = None
 stdinfile = None
 rcode = 1
 
+def recursive_foreach(params, fvars):
+    var = fvars[0]
+    fvars = fvars[1:]
+    items = get_items(params, params[var])
+    logger.info("parallelizing on %s with items %s" % (var, items))
+    if items is not None:
+        for i in items:
+            params = copy.copy(params)
+            params[var] = i
+            if len(fvars) > 0:
+                recursive_foreach(params, fvars)
+            else:
+                arvados.api().job_tasks().create(body={
+                    'job_uuid': arvados.current_job()['uuid'],
+                    'created_by_job_task_uuid': arvados.current_task()['uuid'],
+                    'sequence': 1,
+                    'parameters': params
+                    }
+                ).execute()
+    else:
+        logger.error("parameter %s with value %s in task.foreach yielded no items" % (var, params[var]))
+        sys.exit(1)
+
 try:
     if "task.foreach" in jobp:
         if arvados.current_task()['sequence'] == 0:
-            var = jobp["task.foreach"]
-            items = get_items(jobp, jobp[var])
-            logger.info("parallelizing on %s with items %s" % (var, items))
-            if items is not None:
-                for i in items:
-                    params = copy.copy(jobp)
-                    params[var] = i
-                    arvados.api().job_tasks().create(body={
-                        'job_uuid': arvados.current_job()['uuid'],
-                        'created_by_job_task_uuid': arvados.current_task()['uuid'],
-                        'sequence': 1,
-                        'parameters': params
-                        }
-                    ).execute()
-                if "task.vwd" in jobp:
-                    # Base vwd collection will be merged with output fragments from
-                    # the other tasks by crunch.
-                    arvados.current_task().set_output(subst.do_substitution(jobp, jobp["task.vwd"]))
-                else:
-                    arvados.current_task().set_output(None)
-                sys.exit(0)
-            else:
+            # This is the first task to start the other tasks and exit
+            fvars = jobp["task.foreach"]
+            if isinstance(fvars, basestring):
+                fvars = [fvars]
+            if not isinstance(fvars, list) or len(fvars) == 0:
+                logger.error("value of task.foreach must be a string or non-empty list")
                 sys.exit(1)
+            recursive_foreach(jobp, jobp["task.foreach"])
+            if "task.vwd" in jobp:
+                # Set output of the first task to the base vwd collection so it
+                # will be merged with output fragments from the other tasks by
+                # crunch.
+                arvados.current_task().set_output(subst.do_substitution(jobp, jobp["task.vwd"]))
+            else:
+                arvados.current_task().set_output(None)
+            sys.exit(0)
     else:
+        # This is the only task so taskp/jobp are the same
         taskp = jobp
 
     if "task.vwd" in taskp:
@@ -173,12 +190,12 @@ try:
     logger.info("{}{}{}".format(' '.join(cmd), (" < " + stdinname) if stdinname is not None else "", (" > " + stdoutname) if stdoutname is not None else ""))
 except subst.SubstitutionError as e:
     logger.error(str(e))
-    logger.error("task parameters was:")
+    logger.error("task parameters were:")
     logger.error(pprint.pformat(taskp))
     sys.exit(1)
 except Exception as e:
     logger.exception("caught exception")
-    logger.error("task parameters was:")
+    logger.error("task parameters were:")
     logger.error(pprint.pformat(taskp))
     sys.exit(1)