From 831a24ae15abed5b956aaadbb10ec79b98a70ec6 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 19 Aug 2025 16:16:30 +0200 Subject: [PATCH] Fix self-destruct scheduler behavior on some Redis setups (#35823) --- app/workers/scheduler/self_destruct_scheduler.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/workers/scheduler/self_destruct_scheduler.rb b/app/workers/scheduler/self_destruct_scheduler.rb index 645d9573215..d7aaef56e73 100644 --- a/app/workers/scheduler/self_destruct_scheduler.rb +++ b/app/workers/scheduler/self_destruct_scheduler.rb @@ -21,8 +21,9 @@ class Scheduler::SelfDestructScheduler def sidekiq_overwhelmed? redis_mem_info = Sidekiq.default_configuration.redis_info + maxmemory = [redis_mem_info['maxmemory'].to_f, redis_mem_info['total_system_memory'].to_f].filter(&:positive?).min - Sidekiq::Stats.new.enqueued > MAX_ENQUEUED || redis_mem_info['used_memory'].to_f > redis_mem_info['total_system_memory'].to_f * MAX_REDIS_MEM_USAGE + Sidekiq::Stats.new.enqueued > MAX_ENQUEUED || redis_mem_info['used_memory'].to_f > maxmemory * MAX_REDIS_MEM_USAGE end def delete_accounts!