From 9c24a16854740f0d8513086f63a602c3a01c5a0f Mon Sep 17 00:00:00 2001 From: crkrenn <6069975+crkrenn@users.noreply.github.com> Date: Wed, 13 May 2020 14:59:39 -0700 Subject: [PATCH 1/4] enabled raw sbatch errors to be logged --- maestrowf/interfaces/script/slurmscriptadapter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maestrowf/interfaces/script/slurmscriptadapter.py b/maestrowf/interfaces/script/slurmscriptadapter.py index 7349a3b0b..787d3d4b8 100644 --- a/maestrowf/interfaces/script/slurmscriptadapter.py +++ b/maestrowf/interfaces/script/slurmscriptadapter.py @@ -200,7 +200,8 @@ def submit(self, step, path, cwd, job_map=None, env=None): jid = re.search('[0-9]+', output).group(0) return SubmissionRecord(SubmissionCode.OK, retcode, jid) else: - LOGGER.warning("Submission returned an error.") + LOGGER.warning("Submission returned an error (see next line).") + LOGGER.warning(output) return SubmissionRecord(SubmissionCode.ERROR, retcode) def check_jobs(self, joblist): From 69f04509e64f75c79bf50c64612bca4153e87e3f Mon Sep 17 00:00:00 2001 From: crkrenn <6069975+crkrenn@users.noreply.github.com> Date: Thu, 14 May 2020 08:55:03 -0700 Subject: [PATCH 2/4] tweaks/correction suggested by Frank --- maestrowf/interfaces/script/slurmscriptadapter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maestrowf/interfaces/script/slurmscriptadapter.py b/maestrowf/interfaces/script/slurmscriptadapter.py index 787d3d4b8..0f1c3d6a6 100644 --- a/maestrowf/interfaces/script/slurmscriptadapter.py +++ b/maestrowf/interfaces/script/slurmscriptadapter.py @@ -200,8 +200,7 @@ def submit(self, step, path, cwd, job_map=None, env=None): jid = re.search('[0-9]+', output).group(0) return SubmissionRecord(SubmissionCode.OK, retcode, jid) else: - LOGGER.warning("Submission returned an error (see next line).") - LOGGER.warning(output) + LOGGER.warning("Submission returned an error (see next line).\n%s", err) return SubmissionRecord(SubmissionCode.ERROR, retcode) def check_jobs(self, joblist): From f1f64faa0a39809dc186a7d335ff1c1249639973 Mon Sep 17 00:00:00 2001 From: crkrenn <6069975+crkrenn@users.noreply.github.com> Date: Thu, 14 May 2020 08:57:17 -0700 Subject: [PATCH 3/4] reduced line length --- maestrowf/interfaces/script/slurmscriptadapter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maestrowf/interfaces/script/slurmscriptadapter.py b/maestrowf/interfaces/script/slurmscriptadapter.py index 0f1c3d6a6..d331bdac7 100644 --- a/maestrowf/interfaces/script/slurmscriptadapter.py +++ b/maestrowf/interfaces/script/slurmscriptadapter.py @@ -200,7 +200,8 @@ def submit(self, step, path, cwd, job_map=None, env=None): jid = re.search('[0-9]+', output).group(0) return SubmissionRecord(SubmissionCode.OK, retcode, jid) else: - LOGGER.warning("Submission returned an error (see next line).\n%s", err) + LOGGER.warning( + "Submission returned an error (see next line).\n%s", err) return SubmissionRecord(SubmissionCode.ERROR, retcode) def check_jobs(self, joblist): From 2f88a7a98bcfc27d92a8eb78ac5a4e0f7089449d Mon Sep 17 00:00:00 2001 From: crkrenn <6069975+crkrenn@users.noreply.github.com> Date: Fri, 15 May 2020 06:45:53 -0700 Subject: [PATCH 4/4] fixed flake8 error in slurm-adapter --- maestrowf/interfaces/script/slurmscriptadapter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maestrowf/interfaces/script/slurmscriptadapter.py b/maestrowf/interfaces/script/slurmscriptadapter.py index d331bdac7..750479644 100644 --- a/maestrowf/interfaces/script/slurmscriptadapter.py +++ b/maestrowf/interfaces/script/slurmscriptadapter.py @@ -201,7 +201,7 @@ def submit(self, step, path, cwd, job_map=None, env=None): return SubmissionRecord(SubmissionCode.OK, retcode, jid) else: LOGGER.warning( - "Submission returned an error (see next line).\n%s", err) + "Submission returned an error (see next line).\n%s", err) return SubmissionRecord(SubmissionCode.ERROR, retcode) def check_jobs(self, joblist):