Handle deleted IOC and old comfigs

BlockServer/core/active_config_holder.py

@@ -13,19 +13,19 @@
 # along with this program; if not, you can obtain a copy from
 # https://www.eclipse.org/org/documents/epl-v10.php or
 # http://opensource.org/licenses/eclipse-1.0.php
 import os
 from typing import Dict
 
 from BlockServer.config.ioc import IOC
 from BlockServer.core.config_holder import ConfigHolder
 from BlockServer.core.database_client import get_iocs
 from server_common.file_path_manager import FILEPATH_MANAGER
 from server_common.constants import IOCS_NOT_TO_STOP
 from server_common.helpers import CONTROL_SYSTEM_PREFIX, MACROS, BLOCK_PREFIX
 from server_common.utilities import print_and_log
 
 
 def _blocks_changed(block1, block2) -> bool:
     """
     Compare two Block objects
 
@@ -47,7 +47,7 @@
     return False
 
 
 def _blocks_changed_in_config(old_config, new_config, block_comparator=_blocks_changed) -> bool:
     """
     Given a new configuration/component and an old one, find out whether blocks have changed between
      them.
@@ -79,7 +79,7 @@
     return False
 
 
 def _compare_ioc_properties(old: Dict[str, IOC], new: Dict[str, IOC]):
     """
     Compares the properties of IOCs in a component/configuration.
 
@@ -118,7 +118,7 @@
     Class to serve up the active configuration.
     """
 
     def __init__(self, macros, archive_manager, file_manager, ioc_control, config_dir) -> None:
         """Constructor.
 
         Args:
@@ -265,8 +265,12 @@
             # cached config or components
             if ioc_name in iocs_in_current_config:
                 continue
-
-            if self._ioc_control.get_ioc_status(ioc_name) == "RUNNING":
+            try:
+                ioc_status = self._ioc_control.get_ioc_status(ioc_name)
+            except Exception as e:
+                print_and_log(f"WARNING: IOC {ioc_name} status UNKNOWN: {e} - has IOC been removed?")
+                ioc_status = "UNKNOWN"
+            if ioc_status == "RUNNING":
                 if ioc_name in iocs_in_new_config:
                     # If the IOC is in the new config, we need to restart it as the new config
                     # may have macros which were not used when the IOC was manually