use InternalServerError

Author: Dengsheng-wzh

rock/admin/core/ray_service.py

@@ -4,9 +4,10 @@
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from apscheduler.triggers.interval import IntervalTrigger
 
+from rock import InternalServerRockError
 from rock.config import RayConfig
 from rock.logger import init_logger
-from rock.utils.rwlock import AsyncRWLock, WriteLockTimeout
+from rock.utils.rwlock import AsyncRWLock
 
 logger = init_logger(__name__)
 
@@ -73,5 +74,5 @@ async def _reconnect_ray(self):
                 logger.info(
                     f"current time {end_time}, Reconnect ray cluster successfully, duration {end_time - start_time}s"
                 )
-        except WriteLockTimeout as e:
+        except InternalServerRockError as e:
             logger.warning("Reconnect ray cluster timeout, skip reconnectting", exc_info=e)

rock/utils/rwlock.py

@@ -1,9 +1,8 @@
 import asyncio
 from contextlib import asynccontextmanager
 
-
-class WriteLockTimeout(Exception):
-    pass
+from rock import InternalServerRockError
+from rock._codes import codes
 
 
 class AsyncRWLock:
@@ -94,7 +93,11 @@ async def release_write(self):
     async def write_lock(self, timeout=None):
         ready = await self.acquire_write(timeout=timeout)
         if not ready:
-            raise WriteLockTimeout()
+            raise InternalServerRockError(
+                f"Failed to acquire write lock within {timeout} seconds. "
+                "This may indicate a deadlock or excessive lock contention in background jobs.",
+                code=codes.INTERNAL_SERVER_ERROR,
+            )
         try:
             yield
         finally:

tests/unit/utils/test_rwlock_timeout.py

@@ -2,7 +2,8 @@
 
 import pytest
 
-from rock.utils.rwlock import AsyncRWLock, WriteLockTimeout
+from rock import InternalServerRockError
+from rock.utils.rwlock import AsyncRWLock
 
 
 @pytest.mark.asyncio
@@ -12,7 +13,7 @@ async def test_rwlock_write_timeout_then_read_lock_ok():
     lock._readers = 1
 
     async def writer():
-        with pytest.raises(WriteLockTimeout):
+        with pytest.raises(InternalServerRockError):
             async with lock.write_lock(timeout=5):
                 pytest.fail("write_lock should have timed out and not enter this block")