projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20652: When polling the API server, limit fields returned
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
executor.py
diff --git
a/sdk/cwl/arvados_cwl/executor.py
b/sdk/cwl/arvados_cwl/executor.py
index ef84dd4983c870d2779a3cf993bcaeff8aa13f6f..ce8aa42095606c455d7c1b60db93e73decc54268 100644
(file)
--- a/
sdk/cwl/arvados_cwl/executor.py
+++ b/
sdk/cwl/arvados_cwl/executor.py
@@
-266,7
+266,7
@@
The 'jobs' API is no longer supported.
activity statuses, for example in the RuntimeStatusLoggingHandler.
"""
activity statuses, for example in the RuntimeStatusLoggingHandler.
"""
- if kind not in ('error', 'warning'):
+ if kind not in ('error', 'warning'
, 'activity'
):
# Ignore any other status kind
return
# Ignore any other status kind
return
@@
-281,7
+281,7
@@
The 'jobs' API is no longer supported.
runtime_status = current.get('runtime_status', {})
original_updatemessage = updatemessage = runtime_status.get(kind, "")
runtime_status = current.get('runtime_status', {})
original_updatemessage = updatemessage = runtime_status.get(kind, "")
- if not updatemessage:
+ if
kind == "activity" or
not updatemessage:
updatemessage = message
# Subsequent messages tacked on in detail
updatemessage = message
# Subsequent messages tacked on in detail
@@
-368,9
+368,10
@@
The 'jobs' API is no longer supported.
while keys:
page = keys[:pageSize]
try:
while keys:
page = keys[:pageSize]
try:
- proc_states = table.list(filters=[["uuid", "in", page]]).execute(num_retries=self.num_retries)
+ proc_states = table.list(filters=[["uuid", "in", page]], select=["uuid", "container_uuid", "state", "log_uuid",
+ "output_uuid", "modified_at", "properties"]).execute(num_retries=self.num_retries)
except Exception as e:
except Exception as e:
- logger.
exception("E
rror checking states on API server: %s", e)
+ logger.
warning("Temporary e
rror checking states on API server: %s", e)
remain_wait = self.poll_interval
continue
remain_wait = self.poll_interval
continue
@@
-593,6
+594,8
@@
The 'jobs' API is no longer supported.
def arv_executor(self, updated_tool, job_order, runtimeContext, logger=None):
self.debug = runtimeContext.debug
def arv_executor(self, updated_tool, job_order, runtimeContext, logger=None):
self.debug = runtimeContext.debug
+ self.runtime_status_update("activity", "initialization")
+
git_info = self.get_git_info(updated_tool) if self.git_info else {}
if git_info:
logger.info("Git provenance")
git_info = self.get_git_info(updated_tool) if self.git_info else {}
if git_info:
logger.info("Git provenance")
@@
-655,6
+658,8
@@
The 'jobs' API is no longer supported.
self.project_uuid = runtimeContext.project_uuid
self.project_uuid = runtimeContext.project_uuid
+ self.runtime_status_update("activity", "data transfer")
+
# Upload local file references in the job order.
with Perf(metrics, "upload_job_order"):
job_order, jobmapper = upload_job_order(self, "%s input" % runtimeContext.name,
# Upload local file references in the job order.
with Perf(metrics, "upload_job_order"):
job_order, jobmapper = upload_job_order(self, "%s input" % runtimeContext.name,
@@
-823,6
+828,8
@@
The 'jobs' API is no longer supported.
# We either running the workflow directly, or submitting it
# and will wait for a final result.
# We either running the workflow directly, or submitting it
# and will wait for a final result.
+ self.runtime_status_update("activity", "workflow execution")
+
current_container = arvados_cwl.util.get_current_container(self.api, self.num_retries, logger)
if current_container:
logger.info("Running inside container %s", current_container.get("uuid"))
current_container = arvados_cwl.util.get_current_container(self.api, self.num_retries, logger)
if current_container:
logger.info("Running inside container %s", current_container.get("uuid"))