From 35c7e0777a26c46ddc92501d2404a7c56a76c8fa Mon Sep 17 00:00:00 2001 From: David Sutherland Date: Thu, 9 May 2024 18:16:15 +1200 Subject: [PATCH 1/4] prune suicide edges fix --- cylc/flow/data_store_mgr.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cylc/flow/data_store_mgr.py b/cylc/flow/data_store_mgr.py index 94354880349..572cf5eca2d 100644 --- a/cylc/flow/data_store_mgr.py +++ b/cylc/flow/data_store_mgr.py @@ -1972,10 +1972,13 @@ def prune_pruned_updated_nodes(self): node = tp_added[tp_id] else: continue - for j_id in list(node.jobs) + list(tp_updated[tp_id].jobs): + update_node = tp_updated[tp_id] + for j_id in list(node.jobs) + list(update_node.jobs): if j_id in j_updated: del j_updated[j_id] - del tp_updated[tp_id] + self.n_window_edges.difference_update(update_node.edges) + self.deltas[EDGES].pruned.extend(update_node.edges) + del update_node self.pruned_task_proxies.clear() def update_family_proxies(self): From 8ef771bc14159cc3f4847100446488d0bef1f6c8 Mon Sep 17 00:00:00 2001 From: David Sutherland Date: Thu, 9 May 2024 22:50:30 +1200 Subject: [PATCH 2/4] Update cylc/flow/data_store_mgr.py Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- cylc/flow/data_store_mgr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/data_store_mgr.py b/cylc/flow/data_store_mgr.py index 572cf5eca2d..284d9cb17e1 100644 --- a/cylc/flow/data_store_mgr.py +++ b/cylc/flow/data_store_mgr.py @@ -1972,7 +1972,7 @@ def prune_pruned_updated_nodes(self): node = tp_added[tp_id] else: continue - update_node = tp_updated[tp_id] + update_node = tp_updated.pop(tp_id) for j_id in list(node.jobs) + list(update_node.jobs): if j_id in j_updated: del j_updated[j_id] From b2e55b7511678b384c296e47a98b9ce7d944a2a2 Mon Sep 17 00:00:00 2001 From: David Sutherland Date: Fri, 10 May 2024 01:22:08 +1200 Subject: [PATCH 3/4] Update cylc/flow/data_store_mgr.py Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- cylc/flow/data_store_mgr.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cylc/flow/data_store_mgr.py b/cylc/flow/data_store_mgr.py index 284d9cb17e1..d58cb2ac92d 100644 --- a/cylc/flow/data_store_mgr.py +++ b/cylc/flow/data_store_mgr.py @@ -1978,7 +1978,6 @@ def prune_pruned_updated_nodes(self): del j_updated[j_id] self.n_window_edges.difference_update(update_node.edges) self.deltas[EDGES].pruned.extend(update_node.edges) - del update_node self.pruned_task_proxies.clear() def update_family_proxies(self): From d903e6f4d321e11204cbb8a9e60894e682a0fac2 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Fri, 10 May 2024 15:05:45 +0100 Subject: [PATCH 4/4] Changelog [skip ci] --- changes.d/6096.fix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes.d/6096.fix.md diff --git a/changes.d/6096.fix.md b/changes.d/6096.fix.md new file mode 100644 index 00000000000..d70face335f --- /dev/null +++ b/changes.d/6096.fix.md @@ -0,0 +1 @@ +Fixed bug that caused graph arrows to go missing in the GUI when suicide triggers are present. \ No newline at end of file