[ARVADOS] created: 1.3.0-1109-gecc538556
Git user
git at public.curoverse.com
Tue Jun 18 17:30:52 UTC 2019
at ecc5385565685bb5a4c4b2e1af3afb3ffea30937 (commit)
commit ecc5385565685bb5a4c4b2e1af3afb3ffea30937
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Tue Jun 18 13:28:40 2019 -0400
15296: Shutdown cancels processes unless running inside a container
Suppress errors in cancel request (such as a double-cancel race).
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 190ea35e2..9a94095ae 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -780,11 +780,16 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
if self.pipeline:
self.api.pipeline_instances().update(uuid=self.pipeline["uuid"],
body={"state": "Failed"}).execute(num_retries=self.num_retries)
- if runtimeContext.submit and isinstance(tool, Runner):
- runnerjob = tool
- if runnerjob.uuid and self.work_api == "containers":
- self.api.container_requests().update(uuid=runnerjob.uuid,
- body={"priority": "0"}).execute(num_retries=self.num_retries)
+
+ if self.work_api == "containers" and not current_container:
+ # Not running in a crunch container, so cancel any outstanding processes.
+ for p in self.processes:
+ try:
+ self.api.container_requests().update(uuid=p,
+ body={"priority": "0"}
+ ).execute(num_retries=self.num_retries)
+ except Exception:
+ pass
finally:
self.workflow_eval_lock.release()
self.task_queue.drain()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list