Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix CLUSTERS_KEEPER_TASK_INTERVAL env var #6812

Merged
merged 5 commits into from
Nov 22, 2024
Merged

🐛 Fix CLUSTERS_KEEPER_TASK_INTERVAL env var #6812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be04470
remove env var validation
giancarloromeo Nov 22, 2024
4d64ea9
update env-devel
giancarloromeo Nov 22, 2024
0ad9967
fix test
giancarloromeo Nov 22, 2024
e3800d4
fix test
giancarloromeo Nov 22, 2024
2ef35df
Merge branch 'master' into fix-cluster-keeper-task-interval-env-var
giancarloromeo Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env-devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
CLUSTERS_KEEPER_LOGLEVEL=INFO
CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
CLUSTERS_KEEPER_TASK_INTERVAL=30
CLUSTERS_KEEPER_TASK_INTERVAL=00:00:30
giancarloromeo marked this conversation as resolved.
Show resolved Hide resolved
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
CLUSTERS_KEEPER_TRACING={}

Expand Down
4 changes: 1 addition & 3 deletions services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,7 @@ def LOG_LEVEL(self) -> LogLevel: # noqa: N802
def _valid_log_level(cls, value: str) -> str:
return cls.validate_log_level(value)

@field_validator(
"CLUSTERS_KEEPER_TASK_INTERVAL", "SERVICE_TRACKING_HEARTBEAT", mode="before"
)
@field_validator("SERVICE_TRACKING_HEARTBEAT", mode="before")
@classmethod
def _validate_interval(
cls, value: str | datetime.timedelta
Expand Down
11 changes: 3 additions & 8 deletions services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@
from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
from simcore_service_clusters_keeper.core.settings import ApplicationSettings

_FAST_POLL_INTERVAL = 1


@pytest.fixture
def app_environment(
app_environment: EnvVarsDict,
monkeypatch: pytest.MonkeyPatch,
) -> EnvVarsDict:
return app_environment | setenvs_from_dict(
monkeypatch, {"CLUSTERS_KEEPER_TASK_INTERVAL": f"{_FAST_POLL_INTERVAL}"}
monkeypatch, {"CLUSTERS_KEEPER_TASK_INTERVAL": "00:00:01"}
)


Expand All @@ -43,10 +41,7 @@ async def test_clusters_management_task_created_and_deleted(
initialized_app: FastAPI,
app_settings: ApplicationSettings,
):
assert (
app_settings.CLUSTERS_KEEPER_TASK_INTERVAL.total_seconds()
== _FAST_POLL_INTERVAL
)
assert app_settings.CLUSTERS_KEEPER_TASK_INTERVAL.total_seconds() == 1
assert hasattr(initialized_app.state, "clusters_cleaning_task")
await asyncio.sleep(5 * _FAST_POLL_INTERVAL)
await asyncio.sleep(5)
mock_background_task.assert_called()
Loading