renaming

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/models.py

@@ -158,7 +158,7 @@ class DaskTask:
 
 
 @dataclass(kw_only=True, slots=True)
-class BufferPool:
+class WarmBufferPool:
     ready_instances: set[EC2InstanceData] = field(default_factory=set)
     pending_instances: set[EC2InstanceData] = field(default_factory=set)
     waiting_to_pull_instances: set[EC2InstanceData] = field(default_factory=set)
@@ -169,7 +169,7 @@ class BufferPool:
 
     def __repr__(self) -> str:
         return (
-            f"BufferPool(ready-count={len(self.ready_instances)}, "
+            f"WarmBufferPool(ready-count={len(self.ready_instances)}, "
             f"pending-count={len(self.pending_instances)}, "
             f"waiting-to-pull-count={len(self.waiting_to_pull_instances)}, "
             f"waiting-to-stop-count={len(self.waiting_to_stop_instances)}, "
@@ -212,20 +212,20 @@ def remove_instance(self, instance: EC2InstanceData) -> None:
 
 
 @dataclass
-class BufferPoolManager:
-    buffer_pools: dict[InstanceTypeType, BufferPool] = field(
-        default_factory=lambda: defaultdict(BufferPool)
+class WarmBufferPoolManager:
+    buffer_pools: dict[InstanceTypeType, WarmBufferPool] = field(
+        default_factory=lambda: defaultdict(WarmBufferPool)
     )
 
     def __repr__(self) -> str:
-        return f"BufferPoolManager({dict(self.buffer_pools)})"
+        return f"WarmBufferPoolManager({dict(self.buffer_pools)})"
 
-    def flatten_buffer_pool(self) -> BufferPool:
+    def flatten_buffer_pool(self) -> WarmBufferPool:
         """returns a flattened buffer pool with all the EC2InstanceData"""
-        flat_pool = BufferPool()
+        flat_pool = WarmBufferPool()
 
         for buffer_pool in self.buffer_pools.values():
-            for f in fields(BufferPool):
+            for f in fields(WarmBufferPool):
                 getattr(flat_pool, f.name).update(getattr(buffer_pool, f.name))
 
         return flat_pool

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_buffer_machines_pool_core.py

@@ -41,7 +41,7 @@
     PREPULL_COMMAND_NAME,
 )
 from ...core.settings import get_application_settings
-from ...models import BufferPool, BufferPoolManager
+from ...models import WarmBufferPool, WarmBufferPoolManager
 from ...utils.warm_buffer_machines import (
     dump_pre_pulled_images_as_tags,
     ec2_buffer_startup_script,
@@ -57,7 +57,7 @@
 
 
 async def _analyze_running_instance_state(
-    app: FastAPI, *, buffer_pool: BufferPool, instance: EC2InstanceData
+    app: FastAPI, *, buffer_pool: WarmBufferPool, instance: EC2InstanceData
 ):
     ssm_client = get_ssm_client(app)
     app_settings = get_application_settings(app)
@@ -111,7 +111,7 @@ async def _analyze_running_instance_state(
 
 async def _analyse_current_state(
     app: FastAPI, *, auto_scaling_mode: AutoscalingProvider
-) -> BufferPoolManager:
+) -> WarmBufferPoolManager:
     ec2_client = get_ec2_client(app)
     app_settings = get_application_settings(app)
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
@@ -121,7 +121,7 @@ async def _analyse_current_state(
         tags=get_deactivated_buffer_ec2_tags(auto_scaling_mode.get_ec2_tags(app)),
         state_names=["stopped", "pending", "running", "stopping"],
     )
-    buffers_manager = BufferPoolManager()
+    buffers_manager = WarmBufferPoolManager()
     for instance in all_buffer_instances:
         match instance.state:
             case "stopped":
@@ -149,8 +149,8 @@ async def _analyse_current_state(
 
 async def _terminate_unneeded_pools(
     app: FastAPI,
-    buffers_manager: BufferPoolManager,
-) -> BufferPoolManager:
+    buffers_manager: WarmBufferPoolManager,
+) -> WarmBufferPoolManager:
     ec2_client = get_ec2_client(app)
     app_settings = get_application_settings(app)
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
@@ -177,8 +177,8 @@ async def _terminate_unneeded_pools(
 
 
 async def _terminate_instances_with_invalid_pre_pulled_images(
-    app: FastAPI, buffers_manager: BufferPoolManager
-) -> BufferPoolManager:
+    app: FastAPI, buffers_manager: WarmBufferPoolManager
+) -> WarmBufferPoolManager:
     ec2_client = get_ec2_client(app)
     app_settings = get_application_settings(app)
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
@@ -211,8 +211,8 @@ async def _terminate_instances_with_invalid_pre_pulled_images(
 
 
 async def _terminate_broken_instances(
-    app: FastAPI, buffers_manager: BufferPoolManager
-) -> BufferPoolManager:
+    app: FastAPI, buffers_manager: WarmBufferPoolManager
+) -> WarmBufferPoolManager:
     ec2_client = get_ec2_client(app)
     termineatable_instances = set()
     for pool in buffers_manager.buffer_pools.values():
@@ -226,10 +226,10 @@ async def _terminate_broken_instances(
 
 async def _add_remove_buffer_instances(
     app: FastAPI,
-    buffers_manager: BufferPoolManager,
+    buffers_manager: WarmBufferPoolManager,
     *,
     auto_scaling_mode: AutoscalingProvider,
-) -> BufferPoolManager:
+) -> WarmBufferPoolManager:
     ec2_client = get_ec2_client(app)
     app_settings = get_application_settings(app)
     assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
@@ -292,7 +292,7 @@ async def _add_remove_buffer_instances(
 
 
 async def _handle_pool_image_pulling(
-    app: FastAPI, instance_type: InstanceTypeType, pool: BufferPool
+    app: FastAPI, instance_type: InstanceTypeType, pool: WarmBufferPool
 ) -> tuple[InstancesToStop, InstancesToTerminate]:
     ec2_client = get_ec2_client(app)
     ssm_client = get_ssm_client(app)
@@ -360,7 +360,7 @@ async def _handle_pool_image_pulling(
 
 
 async def _handle_image_pre_pulling(
-    app: FastAPI, buffers_manager: BufferPoolManager
+    app: FastAPI, buffers_manager: WarmBufferPoolManager
 ) -> None:
     ec2_client = get_ec2_client(app)
     instances_to_stop: set[EC2InstanceData] = set()

services/autoscaling/src/simcore_service_autoscaling/modules/instrumentation/_models.py

@@ -4,7 +4,7 @@
 from prometheus_client import CollectorRegistry, Counter, Histogram
 from servicelib.instrumentation import MetricsBase
 
-from ...models import BufferPoolManager, Cluster
+from ...models import Cluster, WarmBufferPoolManager
 from ._constants import (
     BUFFER_POOLS_METRICS_DEFINITIONS,
     CLUSTER_METRICS_DEFINITIONS,
@@ -165,7 +165,7 @@ def __post_init__(self) -> None:
         )
 
     def update_from_buffer_pool_manager(
-        self, buffer_pool_manager: BufferPoolManager
+        self, buffer_pool_manager: WarmBufferPoolManager
     ) -> None:
         flat_pool = buffer_pool_manager.flatten_buffer_pool()