reset more merged protobuf objects

Author: dwsutherland

cylc/flow/data_store_mgr.py

@@ -231,6 +231,15 @@
     WORKFLOW: {'log_records': 10}
 }
 
+# Data types for protobuf memory reset
+RESET_PROTOBUF_TYPES = {
+    TASKS,
+    TASK_PROXIES,
+    FAMILIES,
+    FAMILY_PROXIES,
+    WORKFLOW,
+}
+
 # internal runtime to protobuf field name mapping
 RUNTIME_CFG_MAP_TO_FIELD = {
     'completion': 'completion',
@@ -421,6 +430,10 @@ def apply_delta(key, delta, data):
 
     # Merge in updated fields
     if getattr(delta, 'updated', False):
+        # Flag for clearing memory accumulation
+        reset_protobuf = False
+        if key in RESET_PROTOBUF_TYPES:
+            reset_protobuf = True
         if key == WORKFLOW:
             # Clear fields that require overwrite with delta
             field_set = {f.name for f, _ in delta.updated.ListFields()}
@@ -437,6 +450,10 @@ def apply_delta(key, delta, data):
                     lst = getattr(data[key], field_name)
                     while len(lst) > max_len:
                         lst.pop(0)
+
+            # Clear memory accumulation
+            if reset_protobuf:
+                data[key] = reset_protobuf_object(PbWorkflow, data[key])
         else:
             for element in delta.updated:
                 try:
@@ -446,8 +463,9 @@ def apply_delta(key, delta, data):
                         if field.name in CLEAR_FIELD_MAP[key]:
                             data_element.ClearField(field.name)
                     data_element.MergeFrom(element)
+
                     # Clear memory accumulation
-                    if key in (TASKS, FAMILIES):
+                    if reset_protobuf:
                         data[key][element.id] = reset_protobuf_object(
                             MESSAGE_MAP[key],
                             data_element
@@ -461,10 +479,6 @@ def apply_delta(key, delta, data):
                     )
                     continue
 
-    # Clear memory accumulation
-    if key == WORKFLOW:
-        data[key] = reset_protobuf_object(PbWorkflow, data[key])
-
     # Prune data elements
     if hasattr(delta, 'pruned'):
         # UIS flag to prune workflow, set externally.