[ARVADOS] updated: 1.1.4-187-g6e098e8

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py | 4 ----
 sdk/cwl/arvados_cwl/arvjob.py       | 6 ------
 2 files changed, 10 deletions(-)

       via  6e098e8fde75fcec7e5be1a4873029f394bd055a (commit)
      from  4e9537b3a6c8dcd796b3e7d29630fe9ef2a9204c (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 6e098e8fde75fcec7e5be1a4873029f394bd055a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu May 3 13:46:57 2018 -0400

    13365: Fix race condition between job submitted and event monitor threads
    
    Don't call "done" if work reuse means a container request or job
    immediately comes back as Completed because it might get called
    twice.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index afcf2db..9588803 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -260,7 +260,6 @@ class ArvadosContainer(object):
 
             if response["state"] == "Final":
                 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"])
         except Exception as e:
@@ -455,9 +454,6 @@ class RunnerContainer(Runner):
 
         logger.info("%s submitted container %s", self.arvrunner.label(self), response["uuid"])
 
-        if response["state"] == "Final":
-            self.done(response)
-
     def done(self, record):
         try:
             container = self.arvrunner.api.containers().get(
diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index decd692..801be7d 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -174,9 +174,6 @@ class ArvadosJob(object):
                         logger.info("Creating read permission on job %s: %s",
                                     response["uuid"],
                                     e)
-
-                with Perf(metrics, "done %s" % self.name):
-                    self.done(response)
             else:
                 logger.info("%s %s is %s", self.arvrunner.label(self), response["uuid"], response["state"])
         except Exception as e:
@@ -357,9 +354,6 @@ class RunnerJob(Runner):
         self.uuid = job["uuid"]
         self.arvrunner.process_submitted(self)
 
-        if job["state"] in ("Complete", "Failed", "Cancelled"):
-            self.done(job)
-
 
 class RunnerTemplate(object):
     """An Arvados pipeline template that invokes a CWL workflow."""

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


hooks/post-receive
--