refactor

Author: sanderegg

packages/service-library/src/servicelib/project_lock.py

@@ -11,6 +11,7 @@
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectLocked, ProjectStatus
 from redis.asyncio.lock import Lock
+from servicelib.redis._client import RedisClientSDK
 
 from .background_task import periodic_task
 from .logging_utils import log_context
@@ -31,7 +32,8 @@ async def _auto_extend_project_lock(project_lock: Lock) -> None:
 
 @asynccontextmanager
 async def lock_project(
-    redis_lock: Lock,
+    redis_client: RedisClientSDK,
+    *,
     project_uuid: str | ProjectID,
     status: ProjectStatus,
     owner: Owner | None = None,
@@ -42,6 +44,11 @@ async def lock_project(
         ProjectLockError: if project is already locked
     """
 
+    redis_lock = redis_client.create_lock(
+        PROJECT_REDIS_LOCK_KEY.format(project_uuid),
+        ttl=PROJECT_LOCK_TIMEOUT,
+    )
+
     try:
         if not await redis_lock.acquire(
             blocking=False,

services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py

@@ -5,11 +5,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_state import ProjectStatus
 from servicelib.logging_utils import log_context
-from servicelib.project_lock import (
-    PROJECT_LOCK_TIMEOUT,
-    PROJECT_REDIS_LOCK_KEY,
-    lock_project,
-)
+from servicelib.project_lock import lock_project
 from simcore_postgres_database.utils_projects import (
     DBProjectNotFoundError,
     ProjectsRepo,
@@ -60,12 +56,8 @@ async def removal_policy_task(app: FastAPI) -> None:
                 logging.INFO,
                 msg=f"Removing data for project {project_id} started, project last change date {_project_last_change_date}, efs removal policy task age limit timedelta {app_settings.EFS_REMOVAL_POLICY_TASK_AGE_LIMIT_TIMEDELTA}",
             ):
-                redis_lock = get_redis_lock_client(app).create_lock(
-                    PROJECT_REDIS_LOCK_KEY.format(project_id),
-                    ttl=PROJECT_LOCK_TIMEOUT,
-                )
                 async with lock_project(
-                    redis_lock,
+                    get_redis_lock_client(app),
                     project_uuid=project_id,
                     status=ProjectStatus.MAINTAINING,
                 ):

services/web/server/src/simcore_service_webserver/projects/lock.py

@@ -6,10 +6,10 @@
 from models_library.projects import ProjectID
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectLocked, ProjectStatus
-from servicelib.project_lock import PROJECT_LOCK_TIMEOUT, PROJECT_REDIS_LOCK_KEY
+from servicelib.project_lock import PROJECT_REDIS_LOCK_KEY
 from servicelib.project_lock import lock_project as common_lock_project
 
-from ..redis import get_redis_lock_manager_client
+from ..redis import get_redis_lock_manager_client, get_redis_lock_manager_client_sdk
 from ..users.api import FullNameDict
 
 _logger = logging.getLogger(__name__)
@@ -28,15 +28,11 @@ async def lock_project(
     Raises:
         ProjectLockError: if project is already locked
     """
-
-    redis_lock = get_redis_lock_manager_client(app).lock(
-        PROJECT_REDIS_LOCK_KEY.format(project_uuid),
-        timeout=PROJECT_LOCK_TIMEOUT.total_seconds(),
-    )
-    owner = Owner(user_id=user_id, **user_fullname)
-
     async with common_lock_project(
-        redis_lock, project_uuid=project_uuid, status=status, owner=owner
+        get_redis_lock_manager_client_sdk(app),
+        project_uuid=project_uuid,
+        status=status,
+        owner=Owner(user_id=user_id, **user_fullname),
     ):
         yield