Fix self-destruct scheduler behavior on some Redis setups (#35823)

3 months ago · 567f337db3
parent 97f118013a
commit 567f337db3
1 changed files with 2 additions and 1 deletions
--- 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!