diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-23 13:53:02 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-23 14:11:23 -0700 |
commit | 29e60b0643ca5451919df233a9aeb4825779e846 (patch) | |
tree | ecd3e096248170de33f53912c3f215fdd6f3e1e5 /app/controllers | |
parent | 20d38feda1b7085a2d1246a960ab575cd545da8f (diff) | |
download | gitlab-ce-29e60b0643ca5451919df233a9aeb4825779e846.tar.gz |
Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-one
Projects that have a pipeline may need to check whether the user has
permission to read the build (`can?(current_user, :read_build,
project)`), which requires checking the `project_features` table.
This would cause an N+1 SQL query for each project.
This change also has a beneficial side effect that may avoid a race
condition. When a user deletes a project, the project is queued for
deletion and the user is redirected back to the dashboard page. However,
the following may happen:
1. The dashboard page may load this deleted project in the list of
20 projects.
2. The view will load the project pipeline status from the cache and
attempt to show each project.
3. When the view encounters the deleted project, it calls
`can?(current_user, :read_build, project)` to determine whether to
display the pipeline status.
4. Sidekiq deletes the project from the database.
5. However, since the deleted project is still loaded in memory, it will
attempt to call `project.project_feature.access_level`.
6. Since `project_feature` was not eager loaded, a lazy `SELECT` call is
made to the database.
7. This `SELECT` call returns nothing, and the user sees a 500 error.
By eager loading `project_feature`, we can ensure that we have a
consistent view and avoid records from being deleted later.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 71f18694613..1dc89943f7f 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -70,6 +70,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController .new(params: finder_params, current_user: current_user) .execute .includes(:route, :creator, :group, namespace: [:route, :owner]) + .preload(:project_feature) .page(finder_params[:page]) prepare_projects_for_rendering(projects) |