Merge branch 'develop' into add-no-containers-option

Author: badrogger

core/schains/monitor/action.py

@@ -297,8 +297,7 @@ def firewall_rules(self) -> bool:
     def skaled_container(
         self,
         download_snapshot: bool = False,
-        start_ts: Optional[int] = None,
-        restart_on_exit: bool = True
+        start_ts: Optional[int] = None
     ) -> bool:
         logger.info(
             'Starting skaled container watchman snapshot: %s, start_ts: %s',
@@ -311,7 +310,6 @@ def skaled_container(
             skaled_status=self.skaled_status,
             download_snapshot=download_snapshot,
             start_ts=start_ts,
-            restart_on_exit=restart_on_exit,
             dutils=self.dutils
         )
         time.sleep(CONTAINER_POST_RUN_DELAY)

core/schains/monitor/containers.py

@@ -52,7 +52,6 @@ def monitor_schain_container(
     skaled_status,
     download_snapshot=False,
     start_ts=None,
-    restart_on_exit=True,
     dutils=None
 ) -> None:
     dutils = dutils or DockerUtils()
@@ -63,7 +62,7 @@ def monitor_schain_container(
         logger.error(f'Data volume for sChain {schain_name} does not exist')
         return
 
-    if not restart_on_exit and skaled_status.exit_time_reached:
+    if skaled_status.exit_time_reached:
         logger.info(
             f'{schain_name} - Skipping container monitor: exit time reached')
         skaled_status.log()

core/schains/monitor/skaled_monitor.py

@@ -161,7 +161,7 @@ def execute(self):
         if not self.checks.volume:
             self.am.volume()
         if not self.checks.skaled_container:
-            self.am.skaled_container(restart_on_exit=False)
+            self.am.skaled_container()
         else:
             self.am.reset_restart_counter()
         if not self.checks.rpc:

tests/schains/monitor/action/skaled_action_test.py

@@ -39,7 +39,6 @@ def monitor_schain_container_mock(
     skaled_status,
     download_snapshot=False,
     start_ts=None,
-    restart_on_exit=True,
     dutils=None
 ):
     image_name, container_name, _, _ = get_container_info(
@@ -133,7 +132,6 @@ def test_skaled_container_with_snapshot_action(skaled_am):
             skaled_status=skaled_am.skaled_status,
             download_snapshot=True,
             start_ts=None,
-            restart_on_exit=True,
             dutils=skaled_am.dutils
         )
         assert monitor_schain_mock.call_count == 1
@@ -157,7 +155,6 @@ def test_skaled_container_snapshot_delay_start_action(skaled_am):
             skaled_status=skaled_am.skaled_status,
             download_snapshot=True,
             start_ts=ts,
-            restart_on_exit=True,
             dutils=skaled_am.dutils
         )
         assert monitor_schain_mock.call_count == 1