Break Project#perform_housekeeping in two methods

1 files changed, 12 insertions, 4 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 3bc95b1afcb..f7db8c2bede 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,7 +350,10 @@ class Project < ActiveRecord::Base
       project.run_after_commit { add_import_job }
     end
 
-    after_transition started: :finished, do: :perform_housekeeping
+    after_transition started: :finished do |project, _|
+      project.reset_cache_and_import_attrs
+      project.perform_housekeeping
+    end
   end
 
   class << self
@@ -502,17 +505,22 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def reset_cache_and_import_attrs
+    run_after_commit do
+      ProjectCacheWorker.perform_async(self.id)
+    end
+
+    remove_import_data
+  end
+
   def perform_housekeeping
     run_after_commit do
       begin
-        ProjectCacheWorker.perform_async(self.id)
         Projects::HousekeepingService.new(self).execute
       rescue Projects::HousekeepingService::LeaseTaken => e
         Rails.logger.info("Could not perform housekeeping for project #{self.path_with_namespace} (#{self.id}): #{e}")
       end
     end
-
-    remove_import_data
   end
 
   def remove_import_data