- Replace list-based queue with sorted set for better dead client cleanup - Add zombie cleanup buffer to handle expired queue entries - Fix potential None loop reference in graceful shutdown - Add task start time to write_message_task result - Update lock acquisition script to use ZSET operations - Remove unused queue cleanup scripts - Ensure proper lock release and renewal failure handling
165 lines
3.9 KiB
Python
165 lines
3.9 KiB
Python
import threading
|
|
import time
|
|
import uuid
|
|
|
|
import redis
|
|
|
|
UNLOCK_SCRIPT = """
|
|
if redis.call("get", KEYS[1]) == ARGV[1] then
|
|
return redis.call("del", KEYS[1])
|
|
end
|
|
|
|
return 0
|
|
"""
|
|
|
|
RENEW_SCRIPT = """
|
|
if redis.call("get", KEYS[1]) == ARGV[1] then
|
|
return redis.call("expire", KEYS[1], ARGV[2])
|
|
else
|
|
return 0
|
|
end
|
|
"""
|
|
|
|
ACQUIRE_SCRIPT = """
|
|
local queue_key = KEYS[1]
|
|
local lock_key = KEYS[2]
|
|
|
|
local client_id = ARGV[1]
|
|
local expire = tonumber(ARGV[2])
|
|
local time_out = tonumber(ARGV[3])
|
|
|
|
local now = tonumber(redis.call("time")[1])
|
|
|
|
if redis.call("zscore", queue_key, client_id) == false then
|
|
redis.call("zadd", queue_key, now, client_id)
|
|
end
|
|
|
|
local expired = redis.call("zrangebyscore", queue_key, 0, now - time_out)
|
|
|
|
for _, v in ipairs(expired) do
|
|
redis.call("zrem", queue_key, v)
|
|
end
|
|
|
|
local first = redis.call("zrange", queue_key, 0, 0)[1]
|
|
if first == client_id then
|
|
|
|
if redis.call("set", lock_key, client_id, "NX", "EX", expire) then
|
|
redis.call("zrem", queue_key, client_id)
|
|
return 1
|
|
end
|
|
|
|
if redis.call("get", lock_key) == client_id then
|
|
redis.call("expire", lock_key, expire)
|
|
return 1
|
|
end
|
|
end
|
|
return 0
|
|
"""
|
|
|
|
|
|
def _ensure_str(val):
|
|
if val is None:
|
|
return None
|
|
if isinstance(val, bytes):
|
|
return val.decode("utf-8")
|
|
return str(val)
|
|
|
|
|
|
class RedisFairLock:
|
|
# ZOMBIE CLEAN BUFFER
|
|
CLEANUP_BUFFER = 30
|
|
|
|
def __init__(
|
|
self,
|
|
key: str,
|
|
redis_client: redis.StrictRedis,
|
|
expire: int = 30,
|
|
retry_interval: float = 1,
|
|
timeout: float = 600,
|
|
auto_renewal: bool = True
|
|
):
|
|
self.key = key
|
|
self.queue_key = f"{key}:zset"
|
|
self.value = f"{uuid.uuid4().hex}:{int(time.time())}"
|
|
self.expire = expire
|
|
self.retry_interval = retry_interval
|
|
self.timeout = timeout
|
|
self.redis = redis_client
|
|
self._locked = False
|
|
self.auto_renewal = auto_renewal
|
|
self._renew_thread = None
|
|
self._stop_renew = threading.Event()
|
|
|
|
def acquire(self):
|
|
start = time.time()
|
|
|
|
while True:
|
|
ok = self.redis.eval(
|
|
ACQUIRE_SCRIPT,
|
|
2,
|
|
self.queue_key,
|
|
self.key,
|
|
self.value,
|
|
str(self.expire),
|
|
str(self.timeout + self.CLEANUP_BUFFER)
|
|
)
|
|
|
|
if ok == 1:
|
|
self._locked = True
|
|
if self.auto_renewal:
|
|
self._start_renewal()
|
|
return True
|
|
|
|
if time.time() - start > self.timeout:
|
|
self.redis.zrem(self.queue_key, self.value)
|
|
return False
|
|
|
|
time.sleep(self.retry_interval)
|
|
|
|
def _renewal_loop(self):
|
|
while not self._stop_renew.is_set():
|
|
time.sleep(self.expire / 3)
|
|
if self._stop_renew.is_set():
|
|
break
|
|
|
|
success = self.redis.eval(
|
|
RENEW_SCRIPT,
|
|
1,
|
|
self.key,
|
|
self.value,
|
|
str(self.expire)
|
|
)
|
|
if not success:
|
|
break
|
|
|
|
def _start_renewal(self):
|
|
self._stop_renew = threading.Event()
|
|
self._renew_thread = threading.Thread(target=self._renewal_loop, daemon=True)
|
|
self._renew_thread.start()
|
|
|
|
def _stop_renewal(self):
|
|
self._stop_renew.set()
|
|
if self._renew_thread:
|
|
self._renew_thread.join(timeout=1)
|
|
|
|
def release(self):
|
|
if not self._locked:
|
|
return
|
|
|
|
if self.auto_renewal:
|
|
self._stop_renewal()
|
|
|
|
self.redis.eval(UNLOCK_SCRIPT, 1, self.key, self.value)
|
|
|
|
self._locked = False
|
|
|
|
def __enter__(self):
|
|
ok = self.acquire()
|
|
if not ok:
|
|
raise RuntimeError(f"Get redis lock timeout: {self.key}")
|
|
return self
|
|
|
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
|
self.release()
|
|
|