Merge pull request #1005 from skalenetwork/hotfix-update-config-monitor

Run update config skaled monitor even if config updated but skaled still exited

VERSION

@@ -1 +1 @@
-2.5.2
+2.5.3

core/schains/checks.py

@@ -404,7 +404,7 @@ def get_all(self, log: bool = True, save: bool = False, needed: Optional[List[st
                 needed=needed
             )
             plain_checks.update(subj_checks)
-        if not self.estate.ima_linked:
+        if not self.estate or not self.estate.ima_linked:
             if 'ima_container' in plain_checks:
                 del plain_checks['ima_container']
 

core/schains/monitor/config_monitor.py

@@ -43,12 +43,14 @@ def execute(self) -> None:
 
     def run(self):
         typename = type(self).__name__
-        logger.info('Config monitor type %s starting', typename)
-        self.am._upd_last_seen()
-        self.execute()
-        self.am.log_executed_blocks()
-        self.am._upd_last_seen()
-        logger.info('Config monitor type %s finished', typename)
+        logger.info('Config monitor type starting %s', typename)
+        try:
+            self.am._upd_last_seen()
+            self.execute()
+            self.am.log_executed_blocks()
+            self.am._upd_last_seen()
+        finally:
+            logger.info('Config monitor type finished %s', typename)
 
 
 class RegularConfigMonitor(BaseConfigMonitor):

core/schains/monitor/skaled_monitor.py

@@ -48,13 +48,15 @@ def execute(self) -> None:
 
     def run(self):
         typename = type(self).__name__
-        logger.info('Skaled monitor type %s starting', typename)
-        self.am._upd_last_seen()
-        self.execute()
-        self.am._upd_schain_record()
-        self.am.log_executed_blocks()
-        self.am._upd_last_seen()
-        logger.info('Skaled monitor type %s finished', typename)
+        logger.info('Skaled monitor type starting %s', typename)
+        try:
+            self.am._upd_last_seen()
+            self.execute()
+            self.am._upd_schain_record()
+            self.am.log_executed_blocks()
+            self.am._upd_last_seen()
+        finally:
+            logger.info('Skaled monitor type finished %s', typename)
 
 
 class RegularSkaledMonitor(BaseSkaledMonitor):
@@ -233,9 +235,7 @@ def is_config_update_time(
 ) -> bool:
     if not skaled_status:
         return False
-    return not status['config_updated'] and \
-        not status['skaled_container'] and \
-        skaled_status.exit_time_reached
+    return not status['skaled_container'] and skaled_status.exit_time_reached
 
 
 def is_recreate_mode(schain_record: SChainRecord) -> bool:

tests/schains/monitor/skaled_monitor_test.py

@@ -383,6 +383,7 @@ def test_get_skaled_monitor_new_node(
 def test_get_skaled_monitor_update_config(
     skaled_am,
     skaled_checks_outdated_config,
+    skaled_checks_new_config,
     schain_db,
     skaled_status_exit_time_reached,
 ):
@@ -399,6 +400,16 @@ def test_get_skaled_monitor_update_config(
     )
     assert mon == UpdateConfigSkaledMonitor
 
+    status = skaled_checks_new_config.get_all()
+    status['skaled_container'] = False
+    mon = get_skaled_monitor(
+        skaled_am,
+        status,
+        schain_record,
+        skaled_status_exit_time_reached
+    )
+    assert mon == UpdateConfigSkaledMonitor
+
 
 def test_get_skaled_monitor_recreate(
     skaled_am,