Integrate two workers into one ArchiveTraceWorker with pipeline_background queue. This queue takes loqer precedence than pipeline_default.

5 files changed, 14 insertions, 16 deletions

diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 160a6a92dcb..9962eaccade 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -43,9 +43,9 @@
 - pipeline_cache:expire_pipeline_cache
 - pipeline_creation:create_pipeline
 - pipeline_creation:run_pipeline_schedule
+- pipeline_background:archive_trace
 - pipeline_default:build_coverage
 - pipeline_default:build_trace_sections
-- pipeline_default:create_trace_artifact
 - pipeline_default:pipeline_metrics
 - pipeline_default:pipeline_notification
 - pipeline_default:update_head_pipeline_for_merge_request
@@ -62,8 +62,6 @@
 - repository_check:repository_check_clear
 - repository_check:repository_check_single_repository
 
-- object_storage:archive_legacy_trace
-
 - default
 - mailers # ActionMailer::DeliveryJob.queue_name
 
diff --git a/app/workers/archive_legacy_trace_worker.rb b/app/workers/archive_legacy_trace_worker.rb
deleted file mode 100644
index 01b6224494b..00000000000
--- a/app/workers/archive_legacy_trace_worker.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class ArchiveLegacyTraceWorker
-  include ApplicationWorker
-  include ObjectStorageQueue
-
-  def perform(job_id)
-    Ci::Build.find_by(id: job_id).try do |job|
-      job.trace.archive!
-    end
-  end
-end
diff --git a/app/workers/create_trace_artifact_worker.rb b/app/workers/archive_trace_worker.rb
index a0cec43157e..dea7425ad88 100644
--- a/app/workers/create_trace_artifact_worker.rb
+++ b/app/workers/archive_trace_worker.rb
@@ -1,6 +1,6 @@
-class CreateTraceArtifactWorker
+class ArchiveTraceWorker
   include ApplicationWorker
-  include PipelineQueue
+  include PipelineBackgroundQueue
 
   def perform(job_id)
     Ci::Build.find_by(id: job_id).try do |job|
diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb
index b5ed8d607b3..46f1ac09915 100644
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -12,7 +12,7 @@ class BuildFinishedWorker
 
       # We execute that async as this are two indepentent operations that can be executed after TraceSections and Coverage
       BuildHooksWorker.perform_async(build.id)
-      CreateTraceArtifactWorker.perform_async(build.id)
+      ArchiveTraceWorker.perform_async(build.id)
     end
   end
 end
diff --git a/app/workers/concerns/pipeline_background_queue.rb b/app/workers/concerns/pipeline_background_queue.rb
new file mode 100644
index 00000000000..8bf43de6b26
--- /dev/null
+++ b/app/workers/concerns/pipeline_background_queue.rb
@@ -0,0 +1,10 @@
+##
+# Concern for setting Sidekiq settings for the low priority CI pipeline workers.
+#
+module PipelineBackgroundQueue
+  extend ActiveSupport::Concern
+
+  included do
+    queue_namespace :pipeline_background
+  end
+end