fix bug in output routing for parallel steps

StanfordBioinformatics · Sep 5, 2018 · ef6359c · ef6359c
1 parent ee57999
commit ef6359c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/loomengine_server/api/models/runs.py b/server/loomengine_server/api/models/runs.py
@@ -220,10 +220,12 @@ def push_all_inputs(self):
         unsaved_data_nodes = {}
         for leaf in self.get_leaves():
             if leaf.inputs.exists():
+                leaf_outputs = leaf.outputs.all()
                 for input_set in InputCalculator(leaf)\
                     .get_input_sets():
                     task, task_inputs, task_outputs, data_nodes \
-                        = Task.create_unsaved_task_from_input_set(input_set, leaf)
+                        = Task.create_unsaved_task_from_input_set(
+                            input_set, leaf, leaf_outputs)
                     if task is None:
                         # Task already exists, none to create
                         continue

diff --git a/server/loomengine_server/api/models/tasks.py b/server/loomengine_server/api/models/tasks.py
@@ -268,7 +268,7 @@ def bulk_create_tasks(cls, unsaved_tasks, unsaved_task_inputs,
         return tasks
 
     @classmethod
-    def create_unsaved_task_from_input_set(cls, input_set, run):
+    def create_unsaved_task_from_input_set(cls, input_set, run, run_outputs):
         try:
             if input_set:
                 data_path = input_set.data_path
@@ -303,7 +303,7 @@ def create_unsaved_task_from_input_set(cls, input_set, run):
                     mode=input_item.mode,
                     data_node = data_node))
                 data_nodes[data_node.uuid] = data_node
-            for run_output in run.outputs.all():
+            for run_output in run_outputs:
                 data_node = run_output.data_node.get_or_create_node(
                     data_path, save=False)
                 task_outputs.append(TaskOutput(