warns if all

Author: pcrespov

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -60,7 +60,8 @@ class Config(EC2Settings.Config):
 class EC2InstancesSettings(BaseCustomSettings):
     EC2_INSTANCES_ALLOWED_TYPES: dict[str, EC2InstanceBootSpecific] = Field(
         ...,
-        description="Defines which EC2 instances are considered as candidates for new EC2 instance and their respective boot specific parameters",
+        description="Defines which EC2 instances are considered as candidates for new EC2 instance and their respective boot specific parameters"
+        "WARNING: if empty, all available ec2 instances are allowed",
     )
 
     EC2_INSTANCES_KEY_NAME: str = Field(

services/autoscaling/src/simcore_service_autoscaling/modules/auto_scaling_core.py

@@ -4,6 +4,7 @@
 import datetime
 import itertools
 import logging
+import typing
 from typing import Final, cast
 
 import arrow
@@ -333,24 +334,31 @@ async def _sorted_allowed_instance_types(app: FastAPI) -> list[EC2InstanceType]:
     ec2_client = get_ec2_client(app)
 
     # some instances might be able to run several tasks
+    selected_names = list(
+        app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES
+    )
+    assert set(selected_names).issubset(typing.get_args(InstanceTypeType))  # nosec
+
     allowed_instance_types: list[
         EC2InstanceType
     ] = await ec2_client.get_ec2_instance_capabilities(
-        cast(
-            set[InstanceTypeType],
-            set(
-                app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES,
-            ),
-        )
+        cast(set[InstanceTypeType], set(selected_names))
     )
 
-    def _sort_according_to_allowed_types(instance_type: EC2InstanceType) -> int:
-        assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
-        return list(
-            app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES
-        ).index(f"{instance_type.name}")
+    if selected_names:
 
-    allowed_instance_types.sort(key=_sort_according_to_allowed_types)
+        def _as_selection(instance_type: EC2InstanceType) -> int:
+            assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
+            return selected_names.index(f"{instance_type.name}")
+
+        allowed_instance_types.sort(key=_as_selection)
+    else:
+        # NOTE An empty set to get_ec2_instance_capabilities it will return  ALL of the instances
+        _logger.warning(
+            "All %s instances are allowed since EC2_INSTANCES_ALLOWED_TYPES is set to empty (=%s)",
+            len(allowed_instance_types),
+            selected_names,
+        )
     return allowed_instance_types
 
 
@@ -1131,7 +1139,7 @@ async def _autoscale_cluster(
     # 1. check if we have pending tasks and resolve them by activating some drained nodes
     unrunnable_tasks = await auto_scaling_mode.list_unrunnable_tasks(app)
     _logger.info("found %s unrunnable tasks", len(unrunnable_tasks))
-
+    # NOTE: this function predicts how dask will assign a task to a machine
     queued_or_missing_instance_tasks, cluster = await _assign_tasks_to_current_cluster(
         app, unrunnable_tasks, cluster, auto_scaling_mode
     )

services/autoscaling/tests/unit/test_modules_auto_scaling_core.py

@@ -0,0 +1,51 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
+
+import logging
+
+import pytest
+from fastapi import FastAPI
+from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
+from simcore_service_autoscaling.modules.auto_scaling_core import (
+    _sorted_allowed_instance_types,
+)
+
+
+@pytest.fixture
+def with_empty_ec2_intances_allowed_types(
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+    disabled_rabbitmq: None,
+    mocked_ec2_server_envs: EnvVarsDict,
+    mocked_ssm_server_envs: EnvVarsDict,
+    mocked_redis_server: None,
+) -> EnvVarsDict:
+    return app_environment | setenvs_from_dict(
+        monkeypatch,
+        {
+            "EC2_INSTANCES_ALLOWED_TYPES": "{}",
+        },
+    )
+
+
+async def test_sorted_allowed_instance_types__warns_with_all_available(
+    with_empty_ec2_intances_allowed_types: EnvVarsDict,
+    initialized_app: FastAPI,
+    caplog: pytest.LogCaptureFixture,
+):
+    app = initialized_app
+
+    selected_names = list(
+        app.state.settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ALLOWED_TYPES
+    )
+    assert not selected_names
+
+    with caplog.at_level(logging.WARNING):
+        allowed = await _sorted_allowed_instance_types(app)
+        assert allowed
+        assert len(allowed) > 100
+
+    assert len(caplog.records) == 1