Merge branch 'fix-34417' into 'master'

Perform housekeeping only when an import of a fresh project is completed

Closes #34417

See merge request !12529

1 files changed, 10 insertions, 17 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 4b289d15ae7..cf6515b9fa3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -352,7 +352,16 @@ class Project < ActiveRecord::Base
 
     after_transition started: :finished do |project, _|
       project.reset_cache_and_import_attrs
-      project.perform_housekeeping
+
+      if Gitlab::ImportSources.importer_names.include?(project.import_type) && project.repo_exists?
+        project.run_after_commit do
+          begin
+            Projects::HousekeepingService.new(project).execute
+          rescue Projects::HousekeepingService::LeaseTaken => e
+            Rails.logger.info("Could not perform housekeeping for project #{project.path_with_namespace} (#{project.id}): #{e}")
+          end
+        end
+      end
     end
   end
 
@@ -510,22 +519,6 @@ class Project < ActiveRecord::Base
       ProjectCacheWorker.perform_async(self.id)
     end
 
-    remove_import_data
-  end
-
-  def perform_housekeeping
-    return unless repo_exists?
-
-    run_after_commit do
-      begin
-        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
-  end
-
-  def remove_import_data
     import_data&.destroy
   end