A platform for community discussion. Free, open, simple.
PERF: Parallelize section loading in new dashboard (#40970)
Natalie Tayda2e0fe3bcb2
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rbindex c086da930d7..e9c29da10f8 100644--- a/app/controllers/admin/dashboard_controller.rb+++ b/app/controllers/admin/dashboard_controller.rb@@ -133,36 +133,21 @@ class Admin::DashboardController < Admin::StaffControllerdef dashboard_sections_payloadvisible_ids = AdminDashboardSectionConfiguration.visible_section_ids- data = { sections: visible_ids.map { |id| { id: id, data: section_data(id) } } }+ data = {+ sections:+ AdminDashboardSectionLoader.build(+ section_ids: visible_ids,+ current_user: current_user,+ start_date: params[:start_date],+ end_date: params[:end_date],+ ),+ }if current_user.admin?data[:configuration] = { sections: AdminDashboardSectionConfiguration.sections }enddataend- def section_data(id)- case id- when "highlights"- AdminDashboardHighlights.build(start_date: params[:start_date], end_date: params[:end_date])- when "traffic"- AdminDashboardSiteTraffic.build(- start_date: params[:start_date],- end_date: params[:end_date],- guardian: guardian,- )- when "engagement"- AdminDashboardEngagement.build(- start_date: params[:start_date],- end_date: params[:end_date],- current_user: current_user,- )- when "reports"- AdminDashboard::Reports::Section.build(guardian: guardian)- when "search"- AdminDashboardSearch.build(start_date: params[:start_date], end_date: params[:end_date])- end- end-def mark_new_features_as_seenDiscourseUpdates.mark_new_features_as_seen(current_user.id)enddiff --git a/app/services/admin_dashboard_section_loader.rb b/app/services/admin_dashboard_section_loader.rbnew file mode 100644index 00000000000..f407bb7c385--- /dev/null+++ b/app/services/admin_dashboard_section_loader.rb@@ -0,0 +1,72 @@+# frozen_string_literal: true++class AdminDashboardSectionLoader+ POOL_SIZE = AdminDashboardSectionConfiguration::KNOWN_SECTIONS.size++ def self.build(section_ids:, current_user:, start_date:, end_date:)+ new(+ section_ids: section_ids,+ current_user: current_user,+ start_date: start_date,+ end_date: end_date,+ ).build+ end++ def self.thread_pool+ @thread_pool ||=+ Scheduler::ThreadPool.new(min_threads: 0, max_threads: POOL_SIZE, idle_time: 30)+ end++ def initialize(section_ids:, current_user:, start_date:, end_date:)+ @section_ids = section_ids+ @current_user = current_user+ @start_date = start_date+ @end_date = end_date+ end++ def build+ results = Queue.new++ section_ids.each do |id|+ self.class.thread_pool.post do+ results << { id: id, data: section_data(id, current_user) }+ rescue StandardError => e+ results << { id: id, error: e }+ end+ end++ results_by_id = {}++ section_ids.size.times do+ result = results.pop+ raise result[:error] if result[:error]++ results_by_id[result[:id]] = result+ end++ section_ids.map { |id| results_by_id.fetch(id) }+ end++ private++ attr_reader :section_ids, :current_user, :start_date, :end_date++ def section_data(id, user)+ case id+ when "highlights"+ AdminDashboardHighlights.build(start_date: start_date, end_date: end_date)+ when "traffic"+ AdminDashboardSiteTraffic.build(+ start_date: start_date,+ end_date: end_date,+ guardian: user.guardian,+ )+ when "engagement"+ AdminDashboardEngagement.build(start_date: start_date, end_date: end_date, current_user: user)+ when "reports"+ AdminDashboard::Reports::Section.build(guardian: user.guardian)+ when "search"+ AdminDashboardSearch.build(start_date: start_date, end_date: end_date)+ end+ end+enddiff --git a/spec/services/admin_dashboard_section_loader_spec.rb b/spec/services/admin_dashboard_section_loader_spec.rbnew file mode 100644index 00000000000..9997b82ebe6--- /dev/null+++ b/spec/services/admin_dashboard_section_loader_spec.rb@@ -0,0 +1,48 @@+# frozen_string_literal: true++describe AdminDashboardSectionLoader do+ fab!(:admin)++ after do+ if thread_pool = described_class.instance_variable_get(:@thread_pool)+ thread_pool.shutdown+ thread_pool.wait_for_termination(timeout: 1)+ described_class.remove_instance_variable(:@thread_pool)+ end+ end++ describe ".build" do+ it "ensures the sections are built in order with current user and dates" do+ AdminDashboardSiteTraffic+ .expects(:build)+ .with do |kwargs|+ kwargs[:start_date] == "2026-05-01" && kwargs[:end_date] == "2026-05-07" &&+ kwargs[:guardian].is_a?(Guardian) && kwargs[:guardian].user.id == admin.id+ end+ .returns({ value: "traffic" })+ AdminDashboardEngagement+ .expects(:build)+ .with(start_date: "2026-05-01", end_date: "2026-05-07", current_user: admin)+ .returns({ value: "engagement" })+ AdminDashboardSearch+ .expects(:build)+ .with(start_date: "2026-05-01", end_date: "2026-05-07")+ .returns({ value: "search" })++ expect(+ described_class.build(+ section_ids: %w[traffic engagement search],+ current_user: admin,+ start_date: "2026-05-01",+ end_date: "2026-05-07",+ ),+ ).to eq(+ [+ { id: "traffic", data: { value: "traffic" } },+ { id: "engagement", data: { value: "engagement" } },+ { id: "search", data: { value: "search" } },+ ],+ )+ end+ end+end