Automatic merge of gitlab-org/gitlab-ce master

app/services/projects/after_import_service.rb

@@ -9,7 +9,7 @@ module Projects
     end
 
     def execute
-      Projects::HousekeepingService.new(@project).execute do
+      Projects::HousekeepingService.new(@project, :gc).execute do
         repository.delete_all_refs_except(RESERVED_REF_PREFIXES)
       end
     rescue Projects::HousekeepingService::LeaseTaken => e

app/services/projects/housekeeping_service.rb

@@ -18,8 +18,9 @@ module Projects
       end
     end
 
-    def initialize(project)
+    def initialize(project, task = nil)
       @project = project
+      @task = task
     end
 
     def execute
@@ -69,6 +70,8 @@ module Projects
     end
 
     def task
+      return @task if @task
+
       if pushes_since_gc % gc_period == 0
         :gc
       elsif pushes_since_gc % full_repack_period == 0

changelogs/unreleased/sh-force-gc-after-import.yml

+---
+title: Force a full GC after importing a project
+merge_request: 26803
+author:
+type: performance

spec/services/projects/after_import_service_spec.rb

@@ -13,7 +13,7 @@ describe Projects::AfterImportService do
   describe '#execute' do
     before do
       allow(Projects::HousekeepingService)
-        .to receive(:new).with(project).and_return(housekeeping_service)
+        .to receive(:new).with(project, :gc).and_return(housekeeping_service)
 
       allow(housekeeping_service)
         .to receive(:execute).and_yield

spec/services/projects/housekeeping_service_spec.rb

@@ -88,6 +88,19 @@ describe Projects::HousekeepingService do
         expect(project.pushes_since_gc).to eq(1)
       end
     end
+
+    it 'runs the task specifically requested' do
+      housekeeping = described_class.new(project, :gc)
+
+      allow(housekeeping).to receive(:try_obtain_lease).and_return(:gc_uuid)
+      allow(housekeeping).to receive(:lease_key).and_return(:gc_lease_key)
+
+      expect(GitGarbageCollectWorker).to receive(:perform_async).with(project.id, :gc, :gc_lease_key, :gc_uuid).twice
+
+      2.times do
+        housekeeping.execute
+      end
+    end
   end
 
   describe '#needed?' do

spec/workers/admin_email_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AdminEmailWorker do

spec/workers/archive_trace_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ArchiveTraceWorker do

spec/workers/authorized_projects_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AuthorizedProjectsWorker do

spec/workers/background_migration_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BackgroundMigrationWorker, :sidekiq, :clean_gitlab_redis_shared_state do

spec/workers/build_coverage_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BuildCoverageWorker do

spec/workers/build_finished_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BuildFinishedWorker do

spec/workers/build_hooks_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BuildHooksWorker do

spec/workers/build_success_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BuildSuccessWorker do

spec/workers/build_trace_sections_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BuildTraceSectionsWorker do

spec/workers/ci/archive_traces_cron_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::ArchiveTracesCronWorker do

spec/workers/ci/build_schedule_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildScheduleWorker do

spec/workers/cluster_provision_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ClusterProvisionWorker do

spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ClusterWaitForIngressIpAddressWorker do

spec/workers/concerns/application_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ApplicationWorker do

spec/workers/concerns/cluster_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ClusterQueue do

spec/workers/concerns/cronjob_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CronjobQueue do

spec/workers/concerns/gitlab/github_import/notify_upon_death_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::NotifyUponDeath do

spec/workers/concerns/gitlab/github_import/object_importer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ObjectImporter do

spec/workers/concerns/gitlab/github_import/queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Queue do

spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ReschedulingMethods do

spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::StageMethods do

spec/workers/concerns/pipeline_background_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineBackgroundQueue do

spec/workers/concerns/pipeline_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineQueue do

spec/workers/concerns/project_import_options_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectImportOptions do

spec/workers/concerns/repository_check_queue_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RepositoryCheckQueue do

spec/workers/concerns/waitable_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe WaitableWorker do

spec/workers/create_gpg_signature_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CreateGpgSignatureWorker do

spec/workers/create_note_diff_file_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CreateNoteDiffFileWorker do

spec/workers/create_pipeline_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CreatePipelineWorker do

spec/workers/delete_diff_files_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DeleteDiffFilesWorker do

spec/workers/delete_merged_branches_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DeleteMergedBranchesWorker do

spec/workers/delete_user_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DeleteUserWorker do

spec/workers/deployments/success_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Deployments::SuccessWorker do

spec/workers/detect_repository_languages_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DetectRepositoryLanguagesWorker do

spec/workers/email_receiver_worker_spec.rb

+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe EmailReceiverWorker, :mailer do

spec/workers/emails_on_push_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe EmailsOnPushWorker, :mailer do

spec/workers/every_sidekiq_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Every Sidekiq worker' do

spec/workers/expire_build_artifacts_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ExpireBuildArtifactsWorker do

spec/workers/expire_build_instance_artifacts_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ExpireBuildInstanceArtifactsWorker do

spec/workers/expire_job_cache_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ExpireJobCacheWorker do

spec/workers/expire_pipeline_cache_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ExpirePipelineCacheWorker do

spec/workers/git_garbage_collect_worker_spec.rb

+# frozen_string_literal: true
+
 require 'fileutils'
 
 require 'spec_helper'

spec/workers/gitlab/github_import/advance_stage_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::AdvanceStageWorker, :clean_gitlab_redis_shared_state do

spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ImportDiffNoteWorker do

spec/workers/gitlab/github_import/import_issue_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ImportIssueWorker do

spec/workers/gitlab/github_import/import_note_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ImportNoteWorker do

spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ImportPullRequestWorker do

spec/workers/gitlab/github_import/refresh_import_jid_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::RefreshImportJidWorker do

spec/workers/gitlab/github_import/stage/finish_import_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::FinishImportWorker do

spec/workers/gitlab/github_import/stage/import_base_data_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportBaseDataWorker do

spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportIssuesAndDiffNotesWorker do

spec/workers/gitlab/github_import/stage/import_lfs_objects_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportLfsObjectsWorker do

spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportNotesWorker do

spec/workers/gitlab/github_import/stage/import_pull_requests_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportPullRequestsWorker do

spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Stage::ImportRepositoryWorker do

spec/workers/gitlab_shell_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GitlabShellWorker do

spec/workers/gitlab_usage_ping_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GitlabUsagePingWorker do

spec/workers/group_destroy_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GroupDestroyWorker do

spec/workers/hashed_storage/migrator_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashedStorage::MigratorWorker do

spec/workers/hashed_storage/project_migrate_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashedStorage::ProjectMigrateWorker, :clean_gitlab_redis_shared_state do

spec/workers/invalid_gpg_signature_update_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe InvalidGpgSignatureUpdateWorker do

spec/workers/issue_due_scheduler_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe IssueDueSchedulerWorker do

spec/workers/mail_scheduler/issue_due_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailScheduler::IssueDueWorker do

spec/workers/mail_scheduler/notification_service_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MailScheduler::NotificationServiceWorker do

spec/workers/merge_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe MergeWorker do

spec/workers/namespaceless_project_destroy_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe NamespacelessProjectDestroyWorker do

spec/workers/new_issue_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe NewIssueWorker do

spec/workers/new_merge_request_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe NewMergeRequestWorker do

spec/workers/new_note_worker_spec.rb

+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe NewNoteWorker do

spec/workers/pages_domain_verification_cron_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PagesDomainVerificationCronWorker do

spec/workers/pages_domain_verification_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PagesDomainVerificationWorker do

spec/workers/pipeline_hooks_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineHooksWorker do

spec/workers/pipeline_metrics_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineMetricsWorker do

spec/workers/pipeline_notification_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineNotificationWorker, :mailer do

spec/workers/pipeline_process_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineProcessWorker do

spec/workers/pipeline_schedule_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineScheduleWorker do

spec/workers/pipeline_success_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineSuccessWorker do

spec/workers/pipeline_update_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PipelineUpdateWorker do

spec/workers/plugin_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PluginWorker do

spec/workers/post_receive_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PostReceive do

spec/workers/process_commit_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProcessCommitWorker do

spec/workers/project_cache_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectCacheWorker do

spec/workers/project_destroy_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectDestroyWorker do

spec/workers/project_export_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectExportWorker do

spec/workers/propagate_service_template_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PropagateServiceTemplateWorker do

spec/workers/prune_old_events_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PruneOldEventsWorker do

spec/workers/prune_web_hook_logs_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PruneWebHookLogsWorker do

spec/workers/reactive_caching_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ReactiveCachingWorker do

spec/workers/rebase_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RebaseWorker, '#perform' do

spec/workers/remote_mirror_notification_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RemoteMirrorNotificationWorker, :mailer do

spec/workers/remove_expired_group_links_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RemoveExpiredGroupLinksWorker do

spec/workers/remove_expired_members_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RemoveExpiredMembersWorker do

spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RemoveUnreferencedLfsObjectsWorker do

spec/workers/repository_check/batch_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RepositoryCheck::BatchWorker do

spec/workers/repository_check/clear_worker_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RepositoryCheck::ClearWorker do