X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6284bed37f6b2bb3c0671b401aa0d99d5ef7a5b7..c858ed39886eceb69e54a7c7958aaf8fb4c5a27b:/sdk/cwl/arvados_cwl/__init__.py?ds=sidebyside diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py index 309e9410ef..7bfdba8b80 100644 --- a/sdk/cwl/arvados_cwl/__init__.py +++ b/sdk/cwl/arvados_cwl/__init__.py @@ -24,6 +24,7 @@ from .arvjob import ArvadosJob, RunnerJob, RunnerTemplate from .arvtool import ArvadosCommandTool from .fsaccess import CollectionFsAccess from .arvworkflow import make_workflow +from .perf import Perf from cwltool.process import shortname, UnsupportedRequirement from cwltool.pathmapper import adjustFileObjs @@ -97,7 +98,8 @@ class ArvCwlRunner(object): self.cond.acquire() j = self.processes[uuid] logger.info("Job %s (%s) is %s", j.name, uuid, event["properties"]["new_attributes"]["state"]) - j.done(event["properties"]["new_attributes"]) + with Perf(logger, "done %s" % j.name): + j.done(event["properties"]["new_attributes"]) self.cond.notify() finally: self.cond.release() @@ -162,6 +164,9 @@ class ArvCwlRunner(object): logger.setLevel(logging.WARN) logging.getLogger('arvados.arv-run').setLevel(logging.WARN) + if self.debug: + logger.setLevel(logging.DEBUG) + useruuid = self.api.users().current().execute()["uuid"] self.project_uuid = kwargs.get("project_uuid") if kwargs.get("project_uuid") else useruuid self.pipeline = None @@ -177,7 +182,6 @@ class ArvCwlRunner(object): if kwargs.get("create_workflow") or kwargs.get("update_workflow"): return make_workflow(self, tool, job_order, self.project_uuid, kwargs.get("update_workflow")) - self.debug = kwargs.get("debug") self.ignore_docker_for_reuse = kwargs.get("ignore_docker_for_reuse") kwargs["make_fs_access"] = make_fs_access @@ -244,7 +248,8 @@ class ArvCwlRunner(object): for runnable in jobiter: if runnable: - runnable.run(**kwargs) + with Perf(logger, "run"): + runnable.run(**kwargs) else: if self.processes: self.cond.wait(1)