From 2b95ec7a9a6516a7dd2554e2dd8ecf9ddcfbceb7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 2 Aug 2022 10:39:55 -0400 Subject: [PATCH] 19280: more perf metrics Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/executor.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py index 3e8115ddb1..3241fb607c 100644 --- a/sdk/cwl/arvados_cwl/executor.py +++ b/sdk/cwl/arvados_cwl/executor.py @@ -565,8 +565,9 @@ The 'jobs' API is no longer supported. self.project_uuid = runtimeContext.project_uuid # Upload local file references in the job order. - job_order = upload_job_order(self, "%s input" % runtimeContext.name, - updated_tool, job_order, runtimeContext) + with Perf(metrics, "upload_job_order"): + job_order = upload_job_order(self, "%s input" % runtimeContext.name, + updated_tool, job_order, runtimeContext) # the last clause means: if it is a command line tool, and we # are going to wait for the result, and always_submit_runner @@ -588,14 +589,16 @@ The 'jobs' API is no longer supported. # document with updating disabled because we want to # submit the document with its original CWL version, not # the auto-updated one. - tool = load_tool(updated_tool.tool["id"], loadingContext) + with Perf(metrics, "load_tool original"): + tool = load_tool(updated_tool.tool["id"], loadingContext) else: tool = updated_tool # Upload direct dependencies of workflow steps, get back mapping of files to keep references. # Also uploads docker images. logger.info("Uploading workflow dependencies") - merged_map = upload_workflow_deps(self, tool, runtimeContext) + with Perf(metrics, "upload_workflow_deps"): + merged_map = upload_workflow_deps(self, tool, runtimeContext) # Recreate process object (ArvadosWorkflow or # ArvadosCommandTool) because tool document may have been @@ -604,7 +607,8 @@ The 'jobs' API is no longer supported. loadingContext.loader = tool.doc_loader loadingContext.avsc_names = tool.doc_schema loadingContext.metadata = tool.metadata - tool = load_tool(tool.tool, loadingContext) + with Perf(metrics, "load_tool"): + tool = load_tool(tool.tool, loadingContext) if runtimeContext.update_workflow or runtimeContext.create_workflow: # Create a pipeline template or workflow record and exit. -- 2.30.2