diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-23 16:38:01 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-23 21:26:50 -0700 |
| commit | 440635015fbea129cbfd7b266589ea2a33dda471 (patch) | |
| tree | 13c2379f7d9bb2647f6cd5ba06948f5ad2a3b6c7 /lib/api/issues.rb | |
| parent | 20d38feda1b7085a2d1246a960ab575cd545da8f (diff) | |
| download | gitlab-ce-440635015fbea129cbfd7b266589ea2a33dda471.tar.gz | |
Fix N+1 Gitaly calls in /api/v4/projects/:id/issuessh-fix-nplusone-issues
This is a follow-up from
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31938.
In GitLab 9.0,
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9661 removed the
`subscribed` flag from the API when the user requested a list of issues
or merge requests since calculating this value triggers extensive
Markdown processing.
In GitLab 12.0 via a4fbf39e, we accidentally reintroduced this
performance regression by changing `IssueBasic` to `Issue` in
`entities.rb`. This showed up as a Gitaly N+1 issue since the Markdown
processing would attempt to extract a commit if it detected a regex that
matched a commit.
We restore the prior behavior by once again removing the `subscribed`
flag for the bulk list of issues and merge requests and add a test to
ensure they aren't reintroduced.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66202
Diffstat (limited to 'lib/api/issues.rb')
| -rw-r--r-- | lib/api/issues.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index e16eeef202c..215178478d0 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -163,7 +163,8 @@ module API with_labels_details: declared_params[:with_labels_details], current_user: current_user, project: user_project, - issuable_metadata: issuable_meta_data(issues, 'Issue', current_user) + issuable_metadata: issuable_meta_data(issues, 'Issue', current_user), + include_subscribed: false } present issues, options |