Merge pull request #6980 from MetRonnie/run-mode-bug

Data store: fix empty task proxy runtime field on reload

Author: oliver-sanders

changes.d/6980.fix.md

@@ -0,0 +1 @@
+Fixed a bug where the GUI views would go blank when reloading a workflow.

cylc/flow/commands.py

@@ -609,6 +609,7 @@ async def reload_workflow(schd: 'Scheduler', reload_global: bool = False):
         schd.task_job_mgr.task_remote_mgr.remote_init_map.clear()
         schd.task_job_mgr.task_remote_mgr.is_reload = True
         schd.pool.reload(config)
+        schd.data_store_mgr.apply_task_proxy_db_history()
         # Load jobs from DB
         schd.workflow_db_mgr.pri_dao.select_jobs_for_restart(
             schd.data_store_mgr.insert_db_job

cylc/flow/data_store_mgr.py

@@ -570,7 +570,7 @@ def __init__(self, schd, n_edge_distance=1):
         self.n_window_completed_walks = set()
         self.n_window_depths = {}
         self.update_window_depths = False
-        self.db_load_task_proxies = {}
+        self.db_load_task_proxies: Dict[str, Tuple[TaskProxy, bool]] = {}
         self.family_pruned_ids = set()
         self.prune_trigger_nodes = {}
         self.prune_flagged_nodes = set()
@@ -1527,12 +1527,10 @@ def apply_task_proxy_db_history(self):
                     # added to an already-spawned task before restart.)
 
         # Extract info from itasks to data-store.
-        for task_info in self.db_load_task_proxies.values():
+        for itask, _is_parent in self.db_load_task_proxies.values():
             self._process_internal_task_proxy(
-                task_info[0],
-                self.added[TASK_PROXIES][
-                    self.id_.duplicate(task_info[0].tokens).id
-                ]
+                itask,
+                self.added[TASK_PROXIES][self.id_.duplicate(itask.tokens).id]
             )
 
         # Batch load jobs from DB.

tests/integration/test_reload.py

@@ -19,6 +19,8 @@
 from contextlib import suppress
 
 from cylc.flow import commands
+from cylc.flow.data_store_mgr import TASK_PROXIES
+from cylc.flow.scheduler import Scheduler
 from cylc.flow.task_state import (
     TASK_STATUS_WAITING,
     TASK_STATUS_PREPARING,
@@ -46,16 +48,7 @@ async def test_reload_waits_for_pending_tasks(
     See https://github.com/cylc/cylc-flow/issues/5107
     """
     # a simple workflow with a single task
-    id_ = flow({
-        'scheduling': {
-            'graph': {
-                'R1': 'foo',
-            },
-        },
-        'runtime': {
-            'foo': {},
-        },
-    })
+    id_ = flow('foo')
     schd = scheduler(id_, paused_start=False)
 
     # we will artificially push the task through these states
@@ -270,7 +263,6 @@ async def test_reload_global_platform_group(
 
     # Task using the platform group
     conf = {
-        'scheduler': {'allow implicit tasks': True},
         'scheduling': {'graph': {'R1': 'one'}},
         'runtime': {
             'one': {
@@ -314,3 +306,23 @@ async def test_reload_global_platform_group(
         )
         platform = get_platform(rtconf)
         assert platform['meta']['x'] == '2'
+
+
+async def test_data_store_tproxy(flow, scheduler, start):
+    """Check N>0 task proxy in data store has correct info on reload.
+
+    https://github.com/cylc/cylc-flow/issues/6973
+    """
+    schd: Scheduler = scheduler(flow('foo => bar'))
+
+    def get_ds_tproxy(task):
+        return schd.data_store_mgr.data[schd.id][TASK_PROXIES][
+            f'{schd.id}//1/{task}'
+        ]
+
+    async with start(schd):
+        await schd.update_data_structure()
+        assert str(get_ds_tproxy('bar').runtime)
+
+        await commands.run_cmd(commands.reload_workflow(schd))
+        assert str(get_ds_tproxy('bar').runtime)