gateway: serialize concurrent autoban updates

gateway/usr/share/eterban/autoban_manager.py

@@ -14,6 +14,7 @@ AutoBanManager - управление автоматической разбло
 
 import time
 import logging
+from redis.exceptions import WatchError
 
 log = logging.getLogger(__name__)
 
@@ -73,13 +74,14 @@ class AutoBanManager:
         if not self.enabled:
             return None
 
-        try:
         meta_key = f"{self.META_PREFIX}{ip}"
+        for _ in range(3):
+            pipeline = self.r.pipeline()
+            try:
+                pipeline.watch(meta_key, self.PERMANENT_KEY)
                 now = int(time.time())
-
-            # Получаем существующие метаданные
-            existing = self.r.hgetall(meta_key)
-            is_permanent = self.r.sismember(self.PERMANENT_KEY, ip)
+                existing = pipeline.hgetall(meta_key)
+                is_permanent = pipeline.sismember(self.PERMANENT_KEY, ip)
 
                 if existing:
                     offense_count = int(existing.get(b'offense_count', 0))
@@ -108,7 +110,7 @@ class AutoBanManager:
                     'source': source,
                     'reason': reason
                 }
-            pipeline = self.r.pipeline(transaction=True)
+                pipeline.multi()
                 pipeline.hset(meta_key, mapping=metadata)
 
                 # Добавляем в расписание авто-разбана или в постоянные
@@ -127,9 +129,15 @@ class AutoBanManager:
 
                 return metadata
 
+            except WatchError:
+                continue
             except Exception as e:
                 log.error(f"AutoBanManager.on_ban error: {e}")
                 return None
+            finally:
+                pipeline.reset()
+        log.error("AutoBanManager.on_ban conflict retries exhausted")
+        return None
 
     def on_unban(self, ip, reset_counter=False):
         """