diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-10 13:39:57 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-10 13:39:57 +0000 |
| commit | 377c8e56a6cedd2e2917ffbe37044121c28555ef (patch) | |
| tree | 59b81b9803e79cb343ffae08f5f1eb1904d214f2 | |
| parent | 65faebb95556809c5858347f1c24422505056827 (diff) | |
| download | gitlab-ce-fix-502-mrs-with-lots-of-versions.tar.gz | |
Fix another timeout when searching for pipelinesfix-502-mrs-with-lots-of-versions
When we consider 'all' pipelines for MRs, we now mean:
1. The last 10,000 commits (unordered).
2. From the last 100 MR versions (newest first).
This seems to fix the MRs that time out on GitLab.com.
| -rw-r--r-- | app/models/merge_request.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index efd8cca2947..b2328b7b50f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -865,7 +865,11 @@ class MergeRequest < ActiveRecord::Base # def all_commit_shas if persisted? - column_shas = MergeRequestDiffCommit.where(merge_request_diff: merge_request_diffs).limit(10_000).pluck('sha') + column_shas = MergeRequestDiffCommit + .where(merge_request_diff: merge_request_diffs.order(id: :desc).limit(100)) + .limit(10_000) + .pluck('sha') + serialised_shas = merge_request_diffs.where.not(st_commits: nil).flat_map(&:commit_shas) (column_shas + serialised_shas).uniq diff --git a/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml b/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml new file mode 100644 index 00000000000..32cdfba4eec --- /dev/null +++ b/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml @@ -0,0 +1,6 @@ +--- +title: Ensure merge requests with lots of version don't time out when searching for + pipelines +merge_request: +author: +type: performance |