Fix linting
This commit is contained in:
yangdx
parent
964293f21b
commit
5ee509e671
1 changed files with 85 additions and 44 deletions
|
|
@ -340,14 +340,20 @@ def _release_shared_raw_mp_lock(factory_name: str, key: str):
|
|||
_lock_cleanup_data[combined_key] = current_time
|
||||
|
||||
# Update earliest multiprocess cleanup time (only when earlier)
|
||||
if _earliest_mp_cleanup_time is None or current_time < _earliest_mp_cleanup_time:
|
||||
if (
|
||||
_earliest_mp_cleanup_time is None
|
||||
or current_time < _earliest_mp_cleanup_time
|
||||
):
|
||||
_earliest_mp_cleanup_time = current_time
|
||||
|
||||
# Efficient cleanup triggering with minimum interval control
|
||||
total_cleanup_len = len(_lock_cleanup_data)
|
||||
if total_cleanup_len >= CLEANUP_THRESHOLD:
|
||||
# Time rollback detection
|
||||
if _last_mp_cleanup_time is not None and current_time < _last_mp_cleanup_time:
|
||||
if (
|
||||
_last_mp_cleanup_time is not None
|
||||
and current_time < _last_mp_cleanup_time
|
||||
):
|
||||
direct_log(
|
||||
"== mp Lock == Time rollback detected, resetting cleanup time",
|
||||
level="WARNING",
|
||||
|
|
@ -357,13 +363,14 @@ def _release_shared_raw_mp_lock(factory_name: str, key: str):
|
|||
|
||||
# Check cleanup conditions
|
||||
has_expired_locks = (
|
||||
_earliest_mp_cleanup_time is not None and
|
||||
current_time - _earliest_mp_cleanup_time > CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
_earliest_mp_cleanup_time is not None
|
||||
and current_time - _earliest_mp_cleanup_time
|
||||
> CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
)
|
||||
|
||||
interval_satisfied = (
|
||||
_last_mp_cleanup_time is None or
|
||||
current_time - _last_mp_cleanup_time > MIN_CLEANUP_INTERVAL_SECONDS
|
||||
_last_mp_cleanup_time is None
|
||||
or current_time - _last_mp_cleanup_time > MIN_CLEANUP_INTERVAL_SECONDS
|
||||
)
|
||||
|
||||
if has_expired_locks and interval_satisfied:
|
||||
|
|
@ -373,7 +380,10 @@ def _release_shared_raw_mp_lock(factory_name: str, key: str):
|
|||
|
||||
# Perform cleanup while maintaining the new earliest time
|
||||
for cleanup_key, cleanup_time in list(_lock_cleanup_data.items()):
|
||||
if current_time - cleanup_time > CLEANUP_KEYED_LOCKS_AFTER_SECONDS:
|
||||
if (
|
||||
current_time - cleanup_time
|
||||
> CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
):
|
||||
# Clean expired locks
|
||||
_lock_registry.pop(cleanup_key, None)
|
||||
_lock_registry_count.pop(cleanup_key, None)
|
||||
|
|
@ -381,7 +391,10 @@ def _release_shared_raw_mp_lock(factory_name: str, key: str):
|
|||
cleaned_count += 1
|
||||
else:
|
||||
# Track the earliest time among remaining locks
|
||||
if new_earliest_time is None or cleanup_time < new_earliest_time:
|
||||
if (
|
||||
new_earliest_time is None
|
||||
or cleanup_time < new_earliest_time
|
||||
):
|
||||
new_earliest_time = cleanup_time
|
||||
|
||||
# Update state only after successful cleanup
|
||||
|
|
@ -389,11 +402,15 @@ def _release_shared_raw_mp_lock(factory_name: str, key: str):
|
|||
_last_mp_cleanup_time = current_time
|
||||
|
||||
if cleaned_count > 0:
|
||||
next_cleanup_in = (
|
||||
max(
|
||||
(new_earliest_time + CLEANUP_KEYED_LOCKS_AFTER_SECONDS - current_time) if new_earliest_time else float('inf'),
|
||||
MIN_CLEANUP_INTERVAL_SECONDS
|
||||
next_cleanup_in = max(
|
||||
(
|
||||
new_earliest_time
|
||||
+ CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
- current_time
|
||||
)
|
||||
if new_earliest_time
|
||||
else float("inf"),
|
||||
MIN_CLEANUP_INTERVAL_SECONDS,
|
||||
)
|
||||
direct_log(
|
||||
f"== mp Lock == Cleaned up {cleaned_count}/{total_cleanup_len} expired locks, "
|
||||
|
|
@ -436,8 +453,12 @@ class KeyedUnifiedLock:
|
|||
self._mp_locks: Dict[
|
||||
str, mp.synchronize.Lock
|
||||
] = {} # multi-process lock proxies
|
||||
self._earliest_async_cleanup_time: Optional[float] = None # track earliest async cleanup time
|
||||
self._last_async_cleanup_time: Optional[float] = None # track last async cleanup time for minimum interval
|
||||
self._earliest_async_cleanup_time: Optional[float] = (
|
||||
None # track earliest async cleanup time
|
||||
)
|
||||
self._last_async_cleanup_time: Optional[float] = (
|
||||
None # track last async cleanup time for minimum interval
|
||||
)
|
||||
|
||||
def __call__(self, keys: list[str], *, enable_logging: Optional[bool] = None):
|
||||
"""
|
||||
|
|
@ -476,7 +497,10 @@ class KeyedUnifiedLock:
|
|||
self._async_lock_cleanup_data[key] = current_time
|
||||
|
||||
# Update earliest async cleanup time (only when earlier)
|
||||
if self._earliest_async_cleanup_time is None or current_time < self._earliest_async_cleanup_time:
|
||||
if (
|
||||
self._earliest_async_cleanup_time is None
|
||||
or current_time < self._earliest_async_cleanup_time
|
||||
):
|
||||
self._earliest_async_cleanup_time = current_time
|
||||
self._async_lock_count[key] = count
|
||||
|
||||
|
|
@ -484,7 +508,10 @@ class KeyedUnifiedLock:
|
|||
total_cleanup_len = len(self._async_lock_cleanup_data)
|
||||
if total_cleanup_len >= CLEANUP_THRESHOLD:
|
||||
# Time rollback detection
|
||||
if self._last_async_cleanup_time is not None and current_time < self._last_async_cleanup_time:
|
||||
if (
|
||||
self._last_async_cleanup_time is not None
|
||||
and current_time < self._last_async_cleanup_time
|
||||
):
|
||||
direct_log(
|
||||
"== async Lock == Time rollback detected, resetting cleanup time",
|
||||
level="WARNING",
|
||||
|
|
@ -494,13 +521,15 @@ class KeyedUnifiedLock:
|
|||
|
||||
# Check cleanup conditions
|
||||
has_expired_locks = (
|
||||
self._earliest_async_cleanup_time is not None and
|
||||
current_time - self._earliest_async_cleanup_time > CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
self._earliest_async_cleanup_time is not None
|
||||
and current_time - self._earliest_async_cleanup_time
|
||||
> CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
)
|
||||
|
||||
interval_satisfied = (
|
||||
self._last_async_cleanup_time is None or
|
||||
current_time - self._last_async_cleanup_time > MIN_CLEANUP_INTERVAL_SECONDS
|
||||
self._last_async_cleanup_time is None
|
||||
or current_time - self._last_async_cleanup_time
|
||||
> MIN_CLEANUP_INTERVAL_SECONDS
|
||||
)
|
||||
|
||||
if has_expired_locks and interval_satisfied:
|
||||
|
|
@ -509,8 +538,13 @@ class KeyedUnifiedLock:
|
|||
new_earliest_time = None
|
||||
|
||||
# Perform cleanup while maintaining the new earliest time
|
||||
for cleanup_key, cleanup_time in list(self._async_lock_cleanup_data.items()):
|
||||
if current_time - cleanup_time > CLEANUP_KEYED_LOCKS_AFTER_SECONDS:
|
||||
for cleanup_key, cleanup_time in list(
|
||||
self._async_lock_cleanup_data.items()
|
||||
):
|
||||
if (
|
||||
current_time - cleanup_time
|
||||
> CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
):
|
||||
# Clean expired async locks
|
||||
self._async_lock.pop(cleanup_key)
|
||||
self._async_lock_count.pop(cleanup_key)
|
||||
|
|
@ -518,7 +552,10 @@ class KeyedUnifiedLock:
|
|||
cleaned_count += 1
|
||||
else:
|
||||
# Track the earliest time among remaining locks
|
||||
if new_earliest_time is None or cleanup_time < new_earliest_time:
|
||||
if (
|
||||
new_earliest_time is None
|
||||
or cleanup_time < new_earliest_time
|
||||
):
|
||||
new_earliest_time = cleanup_time
|
||||
|
||||
# Update state only after successful cleanup
|
||||
|
|
@ -526,11 +563,15 @@ class KeyedUnifiedLock:
|
|||
self._last_async_cleanup_time = current_time
|
||||
|
||||
if cleaned_count > 0:
|
||||
next_cleanup_in = (
|
||||
max(
|
||||
(new_earliest_time + CLEANUP_KEYED_LOCKS_AFTER_SECONDS - current_time) if new_earliest_time else float('inf'),
|
||||
MIN_CLEANUP_INTERVAL_SECONDS
|
||||
next_cleanup_in = max(
|
||||
(
|
||||
new_earliest_time
|
||||
+ CLEANUP_KEYED_LOCKS_AFTER_SECONDS
|
||||
- current_time
|
||||
)
|
||||
if new_earliest_time
|
||||
else float("inf"),
|
||||
MIN_CLEANUP_INTERVAL_SECONDS,
|
||||
)
|
||||
direct_log(
|
||||
f"== async Lock == Cleaned up {cleaned_count}/{total_cleanup_len} expired async locks, "
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue