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 13135d0b68499ae5944e3e0f7dd56d30da0412a4..2842e8a114e2e4159c3da97f88b54de28ba3e369 100644 (file)
--- 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 55b8baf6fc18d19ce2e3f752b3de69bfc6fe23d6..4c4db171f50bdfb4d80bee9b1f2dc473b326068c 100644 (file)
--- 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 87bacd02d3096bf7d6e8500630181d0d1d706472..b7f72a97d69eccd5d872861c197b63b9ba9873a6 100644 (file)
--- 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: