[ARVADOS] updated: 322b1729108da208e7376b05e2396b0c9da1c654

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

       via  322b1729108da208e7376b05e2396b0c9da1c654 (commit)
      from  951e08dae514a3c6933343d89700f5708883bb16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 322b1729108da208e7376b05e2396b0c9da1c654
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 18 10:21:55 2016 -0400

    Fix log scanning for "crunchrunner: $(task.outdir)" performed by arvados cwl
    runner.  no issue #

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index c9dd7d4..5ed83ab 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -223,8 +223,14 @@ class ArvadosJob(object):
                         g = keepre.match(l)
                         if g:
                             keepdir = g.group(1)
-                        if tmpdir and outdir and keepdir:
-                            break
+
+                        # It turns out if the job fails and restarts it can
+                        # come up on a different compute node, so we have to
+                        # read the log to the end to be sure instead of taking the
+                        # easy way out.
+                        #
+                        #if tmpdir and outdir and keepdir:
+                        #    break
 
                     self.builder.outdir = outdir
                     self.builder.pathmapper.keepdir = keepdir

-----------------------------------------------------------------------


hooks/post-receive
--