diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-10 03:05:55 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-10 07:51:57 +0300 |
| commit | 08c3e59aeed34ad71e74afb674ddda7327fdc3a7 (patch) | |
| tree | 544d9fa244519ac8b18b29ff8abf47bfdd40b30a /app/controllers | |
| parent | ffa5328c39f195d3253e586569fc2474d3aa6860 (diff) | |
Optimize /admin/applications so that it does not timeout
On our dev instance, /admin/applications as not loading because:
1. There was an unindexed query by `application_id`.
2. There was an expensive query that attempted to load 1 million
unique entries via ActiveRecord just to find the unique count.
We fix the first issue by adding an index for that column.
We fix the second issue with a simple SELECT COUNT(DISTINCT
resource_owner_id) SQL query.
In addition, we add pagination to avoid loading more than 20
applications at once.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/applications_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index 3648c8be426..22e629ccf59 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -7,7 +7,9 @@ class Admin::ApplicationsController < Admin::ApplicationController before_action :load_scopes, only: [:new, :create, :edit, :update] def index - @applications = ApplicationsFinder.new.execute + applications = ApplicationsFinder.new.execute + @applications = Kaminari.paginate_array(applications).page(params[:page]) + @application_counts = OauthAccessToken.distinct_resource_owner_counts(@applications) end def show |