diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-12-12 18:05:46 +0000 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 13:58:17 +0000 |
| commit | 0e4dab9e5ffe65359f8d0fd98a4a156565783e98 (patch) | |
| tree | ab55520dc446d600c27b419632ee6e7e44e8921f | |
| parent | b93a76b08f21e482d15118065eaf61f18451b4ae (diff) | |
| download | gitlab-ce-0e4dab9e5ffe65359f8d0fd98a4a156565783e98.tar.gz | |
Merge branch 'optimize-projects-for-imported-projects' into 'master'
check the import_status field before doing SQL operations to check the import url
See merge request gitlab-org/gitlab-ce!15752
(cherry picked from commit 49a9de110e4d2a70d006759529822b3823b63f96)
946d87d3 check the import_status field before doing SQL operations to check the import url
| -rw-r--r-- | app/models/project.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/optimize-projects-for-imported-projects.yml | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 6ae15a0a50f..3440c01b356 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -659,7 +659,8 @@ class Project < ActiveRecord::Base end def import_started? - import? && import_status == 'started' + # import? does SQL work so only run it if it looks like there's an import running + import_status == 'started' && import? end def import_scheduled? diff --git a/changelogs/unreleased/optimize-projects-for-imported-projects.yml b/changelogs/unreleased/optimize-projects-for-imported-projects.yml new file mode 100644 index 00000000000..13186fa36d5 --- /dev/null +++ b/changelogs/unreleased/optimize-projects-for-imported-projects.yml @@ -0,0 +1,6 @@ +--- +title: check the import_status field before doing SQL operations to check the import + url +merge_request: +author: +type: performance |