From 14219d1c79a415c927f2ac1d6e0cd55b848cf9cd Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Wed, 19 Jun 2024 19:51:32 +0200 Subject: [PATCH 1/5] fix master kill --- ganga/GangaCore/GPIDev/Lib/Job/Job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ganga/GangaCore/GPIDev/Lib/Job/Job.py b/ganga/GangaCore/GPIDev/Lib/Job/Job.py index ad91e2c716..50f6bbe07a 100755 --- a/ganga/GangaCore/GPIDev/Lib/Job/Job.py +++ b/ganga/GangaCore/GPIDev/Lib/Job/Job.py @@ -2476,7 +2476,7 @@ def _kill(self, transition_update): "completed_frozen", ]: jobs.updateStatus( - "killed", transition_update=transition_update + "killed", transition_update=transition_update, update_master = False ) self.updateStatus("killed", transition_update=transition_update) # From e77d9a13a5f9a8f8c20b7c3b30029e853ba865d1 Mon Sep 17 00:00:00 2001 From: mesmith75 Date: Wed, 19 Jun 2024 17:52:49 +0000 Subject: [PATCH 2/5] autopep8 action fixes --- ganga/GangaCore/GPIDev/Lib/Job/Job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ganga/GangaCore/GPIDev/Lib/Job/Job.py b/ganga/GangaCore/GPIDev/Lib/Job/Job.py index 50f6bbe07a..dceac4ea2f 100755 --- a/ganga/GangaCore/GPIDev/Lib/Job/Job.py +++ b/ganga/GangaCore/GPIDev/Lib/Job/Job.py @@ -2476,7 +2476,7 @@ def _kill(self, transition_update): "completed_frozen", ]: jobs.updateStatus( - "killed", transition_update=transition_update, update_master = False + "killed", transition_update=transition_update, update_master=False ) self.updateStatus("killed", transition_update=transition_update) # From cd18860cc6e3b704ccfd10ef798b15a0678768f2 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 24 Jun 2024 13:01:36 +0200 Subject: [PATCH 3/5] bump to failed --- ganga/GangaCore/GPIDev/Lib/Job/Job.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ganga/GangaCore/GPIDev/Lib/Job/Job.py b/ganga/GangaCore/GPIDev/Lib/Job/Job.py index dceac4ea2f..c14707f949 100755 --- a/ganga/GangaCore/GPIDev/Lib/Job/Job.py +++ b/ganga/GangaCore/GPIDev/Lib/Job/Job.py @@ -2462,6 +2462,7 @@ def _kill(self, transition_update): raise JobError(msg) try: if self.backend.master_kill(): + have_failures = False ############ # added as part of typestamp prototype by Justin if not self._getParent(): @@ -2476,9 +2477,14 @@ def _kill(self, transition_update): "completed_frozen", ]: jobs.updateStatus( - "killed", transition_update=transition_update, update_master=False + "killed", transition_update=transition_update ) - self.updateStatus("killed", transition_update=transition_update) + elif jobs.status in ['failed', 'failed_frozen']: + have_failures = True + if have_failures: + self.updateStatus("failed", transition_update=transition_update) + else: + self.updateStatus("killed", transition_update=transition_update) # ############ From 165b96820dd96f5e61568299614090648131fc8f Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 24 Jun 2024 13:17:47 +0200 Subject: [PATCH 4/5] tidy --- ganga/GangaCore/GPIDev/Lib/Job/Job.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ganga/GangaCore/GPIDev/Lib/Job/Job.py b/ganga/GangaCore/GPIDev/Lib/Job/Job.py index c14707f949..352a4ca586 100755 --- a/ganga/GangaCore/GPIDev/Lib/Job/Job.py +++ b/ganga/GangaCore/GPIDev/Lib/Job/Job.py @@ -2462,7 +2462,7 @@ def _kill(self, transition_update): raise JobError(msg) try: if self.backend.master_kill(): - have_failures = False + have_failures ='killed' ############ # added as part of typestamp prototype by Justin if not self._getParent(): @@ -2480,11 +2480,9 @@ def _kill(self, transition_update): "killed", transition_update=transition_update ) elif jobs.status in ['failed', 'failed_frozen']: - have_failures = True - if have_failures: - self.updateStatus("failed", transition_update=transition_update) - else: - self.updateStatus("killed", transition_update=transition_update) + have_failures = 'failed' + + self.updateStatus(have_failures, transition_update=transition_update) # ############ From 630456c2bbb4ba2687e51e257fa989a0a4552983 Mon Sep 17 00:00:00 2001 From: mesmith75 Date: Mon, 24 Jun 2024 11:19:12 +0000 Subject: [PATCH 5/5] autopep8 action fixes --- ganga/GangaCore/GPIDev/Lib/Job/Job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ganga/GangaCore/GPIDev/Lib/Job/Job.py b/ganga/GangaCore/GPIDev/Lib/Job/Job.py index 352a4ca586..de54e1d2a0 100755 --- a/ganga/GangaCore/GPIDev/Lib/Job/Job.py +++ b/ganga/GangaCore/GPIDev/Lib/Job/Job.py @@ -2462,7 +2462,7 @@ def _kill(self, transition_update): raise JobError(msg) try: if self.backend.master_kill(): - have_failures ='killed' + have_failures = 'killed' ############ # added as part of typestamp prototype by Justin if not self._getParent():