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

♻️Director-v0: add setting to control concurrency in client to docker registry #6768

Merged
merged 2 commits into from
Nov 19, 2024
Merged

♻️Director-v0: add setting to control concurrency in client to docker registry #6768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cbb30e
add setting to control concurrency in dv-0
sanderegg Nov 19, 2024
fd23011
set the correct setting
sanderegg Nov 19, 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
5 changes: 4 additions & 1 deletion services/director/src/simcore_service_director/core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from fastapi import FastAPI
from models_library.basic_types import LogLevel, PortInt, VersionTag
from pydantic import Field, NonNegativeInt, validator
from pydantic import Field, NonNegativeInt, PositiveInt, validator
from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
from settings_library.application import BaseApplicationSettings
from settings_library.docker_registry import RegistrySettings
Expand Down Expand Up @@ -94,6 +94,9 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
..., env=["DIRECTOR_MONITORING_ENABLED", "MONITORING_ENABLED"]
)

DIRECTOR_REGISTRY_CLIENT_MAX_CONCURRENT_CALLS: PositiveInt = 20
DIRECTOR_REGISTRY_CLIENT_MAX_NUMBER_OF_RETRIEVED_OBJECTS: PositiveInt = 30

@validator("DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS")
@classmethod
def _validate_substitutions(cls, v):
Expand Down
17 changes: 9 additions & 8 deletions services/director/src/simcore_service_director/registry_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from collections.abc import Mapping
from http import HTTPStatus
from pprint import pformat
from typing import Any, Final, cast
from typing import Any, cast

from aiocache import Cache, SimpleMemoryCache # type: ignore[import-untyped]
from aiohttp import BasicAuth, ClientSession, client_exceptions
Expand Down Expand Up @@ -33,9 +33,6 @@

DEPENDENCIES_LABEL_KEY: str = "simcore.service.dependencies"

NUMBER_OF_RETRIEVED_REPOS: int = 50
NUMBER_OF_RETRIEVED_TAGS: int = 50
_MAX_CONCURRENT_CALLS: Final[int] = 50
VERSION_REG = re.compile(
r"^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$"
)
Expand Down Expand Up @@ -277,7 +274,7 @@ async def on_shutdown() -> None:
async def _list_repositories(app: FastAPI) -> list[str]:
logger.debug("listing repositories")
# if there are more repos, the Link will be available in the response headers until none available
path = f"/v2/_catalog?n={NUMBER_OF_RETRIEVED_REPOS}"
path = f"/v2/_catalog?n={get_application_settings(app).DIRECTOR_REGISTRY_CLIENT_MAX_NUMBER_OF_RETRIEVED_OBJECTS}"
repos_list: list = []
while True:
result, headers = await registry_request(app, path)
Expand All @@ -294,7 +291,7 @@ async def list_image_tags(app: FastAPI, image_key: str) -> list[str]:
logger.debug("listing image tags in %s", image_key)
image_tags: list = []
# get list of image tags
path = f"/v2/{image_key}/tags/list?n={NUMBER_OF_RETRIEVED_TAGS}"
path = f"/v2/{image_key}/tags/list?n={get_application_settings(app).DIRECTOR_REGISTRY_CLIENT_MAX_NUMBER_OF_RETRIEVED_OBJECTS}"
while True:
tags, headers = await registry_request(app, path)
if tags["tags"]:
Expand Down Expand Up @@ -385,7 +382,9 @@ async def get_repo_details(app: FastAPI, image_key: str) -> list[dict[str, Any]]
*[get_image_details(app, image_key, tag) for tag in image_tags],
reraise=False,
log=logger,
limit=_MAX_CONCURRENT_CALLS,
limit=get_application_settings(
app
).DIRECTOR_REGISTRY_CLIENT_MAX_CONCURRENT_CALLS,
)
return [result for result in results if not isinstance(result, BaseException)]

Expand All @@ -407,7 +406,9 @@ async def list_services(app: FastAPI, service_type: ServiceType) -> list[dict]:
*[get_repo_details(app, repo) for repo in repos],
reraise=False,
log=logger,
limit=_MAX_CONCURRENT_CALLS,
limit=get_application_settings(
app
).DIRECTOR_REGISTRY_CLIENT_MAX_CONCURRENT_CALLS,
)

return [
Expand Down
Loading