From aecb38b45fd79546e760f7d5090666875fea97f3 Mon Sep 17 00:00:00 2001
From: nhertz <nhertz@nrao.edu>
Date: Wed, 15 Sep 2021 10:21:06 -0600
Subject: [PATCH] Modified DAG submission code to avoid an exception when no
DAG file is found
---
.../workspaces/workflow/services/workflow_service.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py
index c72e5b24f..362f635dd 100644
--- a/shared/workspaces/workspaces/workflow/services/workflow_service.py
+++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py
@@ -447,10 +447,10 @@ class WorkflowService(WorkflowServiceIF):
logger.info("executing on folder %s", folder)
# some file in here should end in .dag; that file is our dagman input
- dag_file = list(folder.glob("*.dag"))[0]
- if dag_file:
- logger.info("dagman file %s exists.", dag_file)
- return self._submit_dag(folder, dag_file)
+ dag_files = list(folder.glob("*.dag"))
+ if dag_files:
+ logger.info("dagman file %s exists.", dag_files[0])
+ return self._submit_dag(folder, dag_files[0])
else:
job_file = list(folder.glob("*.condor"))[0]
logger.info("condor file %s exists.", job_file)
@@ -496,7 +496,7 @@ class WorkflowService(WorkflowServiceIF):
# submit
logger.info("submitting DAG to condor...")
subprocess.run(
- ["condor_submit_dag", str(dag_file)],
+ ["condor_submit_dag", "-f", str(dag_file)],
cwd=str(folder.absolute()),
preexec_fn=self._switch_to_submituser,
)
--
GitLab