Spaces:
Runtime error
Runtime error
File size: 10,778 Bytes
8dfa3b1 ce2f8f9 8dfa3b1 71d8933 7bd7f5e 71d8933 7bd7f5e 71d8933 ce2f8f9 71d8933 8dfa3b1 ce2f8f9 8dfa3b1 ce2f8f9 7bd7f5e ce2f8f9 7bd7f5e ce2f8f9 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 ce2f8f9 8dfa3b1 ce2f8f9 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 71d8933 8dfa3b1 7bd7f5e 8dfa3b1 71d8933 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 71d8933 8dfa3b1 ce2f8f9 8dfa3b1 ce2f8f9 8dfa3b1 71d8933 8dfa3b1 7bd7f5e 71d8933 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 7bd7f5e 8dfa3b1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | """
Redis-based persistent queue for sync operations.
Replaces in-memory asyncio.Queue with Redis Lists for durability.
"""
import json
import asyncio
from typing import Optional, Dict, Any
from datetime import datetime
import redis.asyncio as redis
from app.core.logging import get_logger
from app.sync.common.models import SyncOperation
logger = get_logger(__name__)
class RedisSyncQueue:
"""
Redis-backed persistent queue for sync operations.
Uses Redis Lists (LPUSH/BRPOP) for FIFO queue with persistence.
Operations survive application restarts.
"""
def __init__(
self,
redis_client: redis.Redis,
queue_name: str,
max_size: int = 10000
):
"""
Initialize Redis sync queue.
Args:
redis_client: Redis client instance (can be None if Redis unavailable)
queue_name: Name of the Redis list key (e.g., "sync:queue:catalogues")
max_size: Maximum queue size (soft limit)
"""
self.redis_client = redis_client
self.queue_name = queue_name
self.max_size = max_size
self.stats_key = f"{queue_name}:stats"
# Log Redis connection info for debugging
logger.info(
"Initialized RedisSyncQueue",
extra={
"event": "queue_init",
"queue_name": queue_name,
"max_size": max_size,
"redis_available": redis_client is not None,
"note": "Sync queue will not persist if Redis is unavailable"
}
)
async def enqueue(self, sync_op: SyncOperation) -> bool:
"""
Add sync operation to queue.
Args:
sync_op: Sync operation to enqueue
Returns:
True if enqueued successfully, False if queue is full or Redis unavailable
"""
if not self.redis_client:
logger.debug(
"Redis unavailable - skipping enqueue",
extra={
"event": "enqueue_skipped",
"queue_name": self.queue_name,
"entity_type": sync_op.entity_type,
"entity_id": sync_op.entity_id
}
)
return False
try:
# Check queue size (soft limit)
current_size = await self.size()
if current_size >= self.max_size:
logger.warning(
"Queue is full",
extra={
"event": "queue_full",
"queue_name": self.queue_name,
"current_size": current_size,
"max_size": self.max_size
}
)
return False
# Serialize operation
payload = {
"entity_type": sync_op.entity_type,
"entity_id": sync_op.entity_id,
"operation": sync_op.operation,
"enqueued_at": datetime.utcnow().isoformat()
}
# Push to Redis list (left push for FIFO with right pop)
await self.redis_client.lpush(self.queue_name, json.dumps(payload))
# Update stats
await self.redis_client.hincrby(self.stats_key, "total_enqueued", 1)
logger.debug(
"Enqueued sync operation",
extra={
"event": "enqueued",
"queue_name": self.queue_name,
"entity_type": sync_op.entity_type,
"entity_id": sync_op.entity_id,
"operation": sync_op.operation,
"queue_size": current_size + 1
}
)
return True
except Exception as e:
logger.error(
"Error enqueuing sync operation",
exc_info=True,
extra={
"event": "enqueue_error",
"queue_name": self.queue_name,
"entity_type": sync_op.entity_type,
"entity_id": sync_op.entity_id
}
)
return False
async def dequeue(self, timeout: int = 1) -> Optional[SyncOperation]:
"""
Remove and return sync operation from queue (blocking).
Args:
timeout: Timeout in seconds for blocking pop (0 = block forever)
Returns:
SyncOperation if available, None if timeout or Redis unavailable
"""
if not self.redis_client:
await asyncio.sleep(timeout) # Simulate timeout
return None
try:
# Blocking right pop (FIFO)
logger.debug(
"Attempting to dequeue",
extra={"event": "dequeue_attempt", "queue_name": self.queue_name, "timeout": timeout},
)
result = await self.redis_client.brpop(self.queue_name, timeout=timeout)
logger.info(
"Redis BRPOP result",
extra={"event": "dequeue_result", "queue_name": self.queue_name, "has_result": result is not None, "result_type": str(type(result))},
)
if not result:
logger.debug("Dequeue timeout", extra={"event": "dequeue_timeout", "queue_name": self.queue_name})
return None
# result is tuple: (key, value)
_, payload_json = result
payload = json.loads(payload_json)
# Deserialize operation
sync_op = SyncOperation(
entity_type=payload["entity_type"],
entity_id=payload["entity_id"],
operation=payload["operation"]
)
# Update stats
await self.redis_client.hincrby(self.stats_key, "total_dequeued", 1)
logger.info(
"Dequeued sync operation",
extra={
"event": "dequeued",
"queue_name": self.queue_name,
"entity_type": sync_op.entity_type,
"entity_id": sync_op.entity_id,
"operation": sync_op.operation
}
)
return sync_op
except asyncio.TimeoutError:
logger.debug("Dequeue asyncio timeout", extra={"event": "dequeue_async_timeout", "queue_name": self.queue_name})
return None
except Exception as e:
logger.error(
"Error dequeuing sync operation",
exc_info=True,
extra={"queue_name": self.queue_name, "error": str(e)}
)
return None
async def size(self) -> int:
"""
Get current queue size.
Returns:
Number of operations in queue (0 if Redis unavailable)
"""
if not self.redis_client:
return 0
try:
size = await self.redis_client.llen(self.queue_name)
return size
except Exception as e:
logger.error(
"Error getting queue size",
exc_info=True,
extra={"queue_name": self.queue_name, "error": str(e)}
)
return 0
async def clear(self) -> bool:
"""
Clear all operations from queue.
Returns:
True if cleared successfully
"""
try:
await self.redis_client.delete(self.queue_name)
logger.info(
"Cleared queue",
extra={"event": "queue_cleared", "queue_name": self.queue_name}
)
return True
except Exception as e:
logger.error(
"Error clearing queue",
exc_info=True,
extra={"queue_name": self.queue_name}
)
return False
async def get_stats(self) -> Dict[str, Any]:
"""
Get queue statistics.
Returns:
Dictionary with queue stats
"""
try:
stats = await self.redis_client.hgetall(self.stats_key)
current_size = await self.size()
return {
"queue_name": self.queue_name,
"current_size": current_size,
"max_size": self.max_size,
"total_enqueued": int(stats.get("total_enqueued", 0)),
"total_dequeued": int(stats.get("total_dequeued", 0)),
"total_processed": int(stats.get("total_processed", 0)),
"total_failed": int(stats.get("total_failed", 0))
}
except Exception as e:
logger.error(
"Error getting queue stats",
exc_info=True,
extra={"queue_name": self.queue_name}
)
return {
"queue_name": self.queue_name,
"error": str(e)
}
async def record_processed(self) -> None:
"""Record successful processing of an operation."""
try:
await self.redis_client.hincrby(self.stats_key, "total_processed", 1)
except Exception as e:
logger.error("Error recording processed stat", exc_info=True, extra={"event": "queue_stat_record_failure", "stat": "total_processed", "error": str(e)})
async def record_failed(self) -> None:
"""Record failed processing of an operation."""
try:
await self.redis_client.hincrby(self.stats_key, "total_failed", 1)
except Exception as e:
logger.error("Error recording failed stat", exc_info=True, extra={"event": "queue_stat_record_failure", "stat": "total_failed", "error": str(e)})
async def peek(self, count: int = 10) -> list:
"""
Peek at operations in queue without removing them.
Args:
count: Number of operations to peek at
Returns:
List of operations (as dicts)
"""
try:
# Get operations from right (oldest first)
items = await self.redis_client.lrange(self.queue_name, -count, -1)
return [json.loads(item) for item in items]
except Exception as e:
logger.error(
"Error peeking at queue",
exc_info=True,
extra={"queue_name": self.queue_name}
)
return []
|