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 49a9de11) 946d87d3 check the import_status field before doing SQL operations to check the import url

Merge branch 'optimize-projects-for-imported-projects' into 'master'
0e4dab9e · Yorick Peterse · LUKE BENNETT · b93a76b0 · 0e4dab9e · 0e4dab9e
Commit 0e4dab9e authored Dec 12, 2017 by Yorick Peterse Committed by LUKE BENNETT Dec 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

project.rb app/models/project.rb +2 -1

optimize-projects-for-imported-projects.yml ...gs/unreleased/optimize-projects-for-imported-projects.yml +6 -0

No files found.
--- 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?

--- a/changelogs/unreleased/optimize-projects-for-imported-projects.yml
+++ b/changelogs/unreleased/optimize-projects-for-imported-projects.yml
+---
+title: check the import_status field before doing SQL operations to check the import
+  url
+merge_request:
+author:
+type: performance