celery异步恢复任务独立队列|扩增celery子进程连接池上限配置

video-gen-api/app/tasks/shot_replicate_tasks.py

@@ -20,7 +20,7 @@ from app.models.base import async_session
 from app.models.shot_replicate_segment import ShotReplicateSegment
 from app.models.shot_replicate_task_set import ShotReplicateTaskSet
 from app.services.module_generation_log_service import log_module_error, log_module_event_file, log_module_prompt_event
-from app.services.redis_registry_service import redis_acquire_lock, redis_release_lock
+from app.services.redis_registry_service import get_registry_redis, redis_acquire_lock, redis_release_lock
 from app.services.module_async_recovery_service import (
     OBJECT_SHOT_SEGMENT_ANALYSIS,
     OBJECT_SHOT_SPLIT_SEGMENT,
@@ -561,8 +561,29 @@ async def _run_split_one_segment(segment_id: str) -> None:
 async def _run_recover_split_tasks_once() -> dict[str, Any]:
     from app.services.shot_replicate_recovery_service import recover_shot_split_tasks_once
 
-    async with async_session() as db:
-        return await recover_shot_split_tasks_once(db)
+    redis = await get_registry_redis()
+    token: str | None = None
+    if redis is not None:
+        token = await redis_acquire_lock(
+            lock_key=settings.SHOT_SPLIT_RECOVERY_LOCK_KEY,
+            ttl_seconds=int(settings.CELERY_RECOVERY_TASK_LOCK_TTL_SECONDS or 600),
+            log_context="shot_split_recovery",
+        )
+        if not token:
+            return {"skipped": "lock_held", "lock_key": settings.SHOT_SPLIT_RECOVERY_LOCK_KEY}
+
+    try:
+        async with async_session() as db:
+            result = await recover_shot_split_tasks_once(db)
+            result["execution_lock"] = "lock_acquired" if token else "redis_unavailable_run_db_fallback"
+            return result
+    finally:
+        if token:
+            await redis_release_lock(
+                lock_key=settings.SHOT_SPLIT_RECOVERY_LOCK_KEY,
+                token=token,
+                log_context="shot_split_recovery",
+            )
 
 
 if celery_app:
@@ -582,8 +603,13 @@ if celery_app:
         return run_async(_run_analyze_custom_segment_video(segment_id))
 
 
-    @celery_app.task(name="shot_replicate.recover_split_tasks_once")
-    def recover_split_tasks_once() -> dict[str, Any]:
+    @celery_app.task(
+        name="shot_replicate.recover_split_tasks_once",
+        bind=True,
+        soft_time_limit=settings.CELERY_RECOVERY_SOFT_TIME_LIMIT_SECONDS,
+        time_limit=settings.CELERY_RECOVERY_TIME_LIMIT_SECONDS,
+    )
+    def recover_split_tasks_once(self) -> dict[str, Any]:
         return run_async(_run_recover_split_tasks_once())
 
 else: