Skip to content

Commit 4a3bba3

Browse files
authored
Receiving output counts as making progress. (#276)
1 parent 75c659d commit 4a3bba3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cwltool/workflow.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ def receive_output(self, step, outputparms, jobout, processStatus):
246246
_logger.info(u"[%s] completed %s", step.name, processStatus)
247247

248248
step.completed = True
249+
self.made_progress = True
249250

250251
def try_make_job(self, step, **kwargs):
251252
# type: (WorkflowJobStep, **Any) -> Generator
@@ -365,7 +366,7 @@ def job(self, joborder, output_callback, **kwargs):
365366

366367
completed = 0
367368
while completed < len(self.steps):
368-
made_progress = False
369+
self.made_progress = False
369370

370371
for step in self.steps:
371372
if kwargs.get("on_error", "stop") == "stop" and self.processStatus != "success":
@@ -385,7 +386,7 @@ def job(self, joborder, output_callback, **kwargs):
385386
if kwargs.get("on_error", "stop") == "stop" and self.processStatus != "success":
386387
break
387388
if newjob:
388-
made_progress = True
389+
self.made_progress = True
389390
yield newjob
390391
else:
391392
break
@@ -396,7 +397,7 @@ def job(self, joborder, output_callback, **kwargs):
396397

397398
completed = sum(1 for s in self.steps if s.completed)
398399

399-
if not made_progress and completed < len(self.steps):
400+
if not self.made_progress and completed < len(self.steps):
400401
if self.processStatus != "success":
401402
break
402403
else:

0 commit comments

Comments
 (0)