From 68d1df8bc3b25f03f41af7cb06bc2ef6f0ed6ad5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 1 Dec 2022 10:32:10 +0100
Subject: [PATCH] Fix some performance issues with /admin/instances (#21907)
/admin/instances?availability=failing remains wholly unefficient
---
app/controllers/admin/instances_controller.rb | 2 +-
app/lib/delivery_failure_tracker.rb | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 5c82331de..7c44e88b7 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -57,7 +57,7 @@ module Admin
end
def preload_delivery_failures!
- warning_domains_map = DeliveryFailureTracker.warning_domains_map
+ warning_domains_map = DeliveryFailureTracker.warning_domains_map(@instances.map(&:domain))
@instances.each do |instance|
instance.failure_days = warning_domains_map[instance.domain]
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index 7c4e28eb7..66c1fd8c0 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -65,8 +65,13 @@ class DeliveryFailureTracker
domains - UnavailableDomain.all.pluck(:domain)
end
- def warning_domains_map
- warning_domains.index_with { |domain| redis.scard(exhausted_deliveries_key_by(domain)) }
+ def warning_domains_map(domains = nil)
+ if domains.nil?
+ warning_domains.index_with { |domain| redis.scard(exhausted_deliveries_key_by(domain)) }
+ else
+ domains -= UnavailableDomain.where(domain: domains).pluck(:domain)
+ domains.index_with { |domain| redis.scard(exhausted_deliveries_key_by(domain)) }.filter { |_, days| days.positive? }
+ end
end
private