[ARVADOS] updated: 0d7ceb1e3498210d20859516de4ffdd59530b6d7

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py     | 2 ++
 sdk/cwl/arvados_cwl/arvcontainer.py | 2 +-
 sdk/cwl/arvados_cwl/arvjob.py       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

       via  0d7ceb1e3498210d20859516de4ffdd59530b6d7 (commit)
      from  7fd60cc870863647127a438a085685d415c37a46 (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 0d7ceb1e3498210d20859516de4ffdd59530b6d7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 25 09:53:13 2017 -0500

    10895: Don't report "reused" for Failed/Cancelled containers.  Tweak log
    message.  Tweak behavior of --debug to also enable arvados SDK debugging.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 13135d0..2842e8a 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -680,9 +680,11 @@ def main(args, stdout, stderr, api_client=None, keep_client=None):
 
     if arvargs.debug:
         logger.setLevel(logging.DEBUG)
+        logging.getLogger('arvados').setLevel(logging.DEBUG)
 
     if arvargs.quiet:
         logger.setLevel(logging.WARN)
+        logging.getLogger('arvados').setLevel(logging.WARN)
         logging.getLogger('arvados.arv-run').setLevel(logging.WARN)
 
     if arvargs.metrics:
diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 55b8baf..4c4db17 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -130,7 +130,7 @@ class ArvadosContainer(object):
             self.arvrunner.processes[self.uuid] = self
 
             if response["state"] == "Final":
-                logger.info("%s reuse container %s", self.arvrunner.label(self), response["container_uuid"])
+                logger.info("%s reused container %s", self.arvrunner.label(self), response["container_uuid"])
                 self.done(response)
             else:
                 logger.info("%s %s state is %s", self.arvrunner.label(self), response["uuid"], response["state"])
diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 87bacd0..b7f72a9 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -141,8 +141,8 @@ class ArvadosJob(object):
 
             self.update_pipeline_component(response)
 
-            if response["state"] in ("Complete", "Failed", "Cancelled"):
-                logger.info("%s reuse job %s", self.arvrunner.label(self), response["uuid"])
+            if response["state"] == "Complete":
+                logger.info("%s reused job %s", self.arvrunner.label(self), response["uuid"])
                 with Perf(metrics, "done %s" % self.name):
                     self.done(response)
             else:

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


hooks/post-receive
--