Merge pull request #1357 from skalenetwork/fix-limits

Fix limits

Author: badrogger

core/chain/containers.py

@@ -59,6 +59,7 @@ def monitor_skaled_container(
     dutils: Optional[DockerUtils] = None,
     passive_node: bool = False,
     historic_state: bool = False,
+    part_of_node: Optional[int] = None,
 ) -> None:
     dutils = dutils or DockerUtils()
     logger.info(f'Monitoring skaled container for {chain_name}')
@@ -83,6 +84,7 @@ def monitor_skaled_container(
             snapshot_from=snapshot_from,
             passive_node=passive_node,
             historic_state=historic_state,
+            part_of_node=part_of_node,
         )
         update_ssl_change_date(chain_record)
         chain_record.reset_failed_counters()
@@ -118,6 +120,7 @@ def monitor_ima_container(
     ima_data: ImaData,
     migration_ts: int = 0,
     dutils: DockerUtils | None = None,
+    part_of_node: Optional[int] = None,
 ) -> None:
     dutils = dutils or DockerUtils()
 
@@ -153,7 +156,12 @@ def monitor_ima_container(
             '%s No IMA container, creating, image %s, time frame %d', chain_name, image, time_frame
         )
         run_ima_container(
-            chain_name, ima_data.chain_id, image=image, time_frame=time_frame, dutils=dutils
+            chain_name,
+            ima_data.chain_id,
+            image=image,
+            time_frame=time_frame,
+            dutils=dutils,
+            part_of_node=part_of_node,
         )
     else:
         logger.debug('Chain %s: IMA container exists, but not running, skipping', chain_name)

core/chain/runner.py

@@ -212,7 +212,7 @@ def run_skaled_container(
 ):
     cpu_limit = None
     mem_limit = None
-    if part_of_node and not passive_node and not is_fair():
+    if part_of_node is not None and not passive_node and not is_fair():
         schain_type = get_schain_type(part_of_node)
         cpu_limit = get_schain_limit(schain_type, MetricType.cpu_shares)
         mem_limit = get_schain_limit(schain_type, MetricType.mem)
@@ -259,7 +259,7 @@ def run_ima_container(
     cpu_limit = None
     mem_limit = None
 
-    if part_of_node:
+    if part_of_node is not None:
         schain_type = get_schain_type(part_of_node)
         cpu_limit = get_ima_limit(schain_type, MetricType.cpu_shares)
         mem_limit = get_ima_limit(schain_type, MetricType.mem)

core/monitor/schain/action_skaled.py

@@ -127,6 +127,7 @@ def skaled_container(
             dutils=self.dutils,
             passive_node=is_passive(),
             historic_state=self.node_options.historic_state,
+            part_of_node=self.schain.part_of_node,
         )
         time.sleep(self.post_run_delay)
         return True
@@ -206,7 +207,11 @@ def ima_container(self) -> bool:
             ima_data = ImaData(linked=self.econfig.ima_linked, chain_id=self.econfig.chain_id)
             logger.info('Running IMA container watchman')
             monitor_ima_container(
-                self.chain_name, ima_data, migration_ts=migration_ts, dutils=self.dutils
+                self.chain_name,
+                ima_data,
+                migration_ts=migration_ts,
+                dutils=self.dutils,
+                part_of_node=self.schain.part_of_node,
             )
         else:
             logger.info('ima_container - ok')

tests/schains/monitor/action/skaled_action_test.py

@@ -40,6 +40,7 @@ def monitor_skaled_container_mock(
     dutils: Optional[DockerUtils] = None,
     passive_node: bool = False,
     historic_state: bool = False,
+    part_of_node: Optional[int] = None,
 ):
     if dutils is None:
         dutils = DockerUtils()
@@ -135,6 +136,7 @@ def test_skaled_container_with_snapshot_action(skaled_am: SkaledActionManager):
             dutils=skaled_am.dutils,
             passive_node=False,
             historic_state=False,
+            part_of_node=skaled_am.schain.part_of_node,
         )
         assert monitor_skaled_container_mock.call_count == 1
     finally:
@@ -161,6 +163,7 @@ def test_skaled_container_snapshot_delay_start_action(skaled_am: SkaledActionMan
             dutils=skaled_am.dutils,
             passive_node=False,
             historic_state=False,
+            part_of_node=skaled_am.schain.part_of_node,
         )
         assert monitor_skaled_container_mock.call_count == 1
     finally: