diff options
| author | Greg Stark <stark@gitlab.com> | 2017-12-05 19:26:02 +0000 |
|---|---|---|
| committer | Greg Stark <stark@gitlab.com> | 2017-12-12 14:10:49 +0000 |
| commit | 10e00ea0457bf7fc9cfba00c8126cca63ebf0730 (patch) | |
| tree | ee6920a0493170a73ec562dcae6185e0952458b3 | |
| parent | 8c77ae2d9eb40d8039f3b142d462f4705a0bf53e (diff) | |
| download | gitlab-ce-optimize-projects-for-imported-projects.tar.gz | |
check the import_status field before doing SQL operations to check the import urloptimize-projects-for-imported-projects
| -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 cc530076bf7..e65c5290699 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -657,7 +657,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 |