Fix the query to select stale live traces

1 files changed, 8 insertions, 10 deletions

diff --git a/app/workers/ci/rescue_stale_live_trace_worker.rb b/app/workers/ci/rescue_stale_live_trace_worker.rb
index 6c8a20f64dd..156ed61c2c5 100644
--- a/app/workers/ci/rescue_stale_live_trace_worker.rb
+++ b/app/workers/ci/rescue_stale_live_trace_worker.rb
@@ -4,16 +4,14 @@ module Ci
     include CronjobQueue
 
     def perform
-      # Archive live traces which still resides in redis or database
-      # This could happen when sidekiq-jobs for archivements are lost by SIGKILL
-      # Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/36791
-      Ci::Build.find_builds_from_stale_live_traces do |builds|
-        builds.each do |build|
-          begin
-            build.trace.archive!
-          rescue => e
-            Rails.logger.error "Failed to archive stale live trace. id: #{build.id} message: #{e.message}"
-          end
+      # Archive stale live traces which still resides in redis or database
+      # This could happen when ArchiveTraceWorker sidekiq jobs were lost by receiving SIGKILL
+      # More details in https://gitlab.com/gitlab-org/gitlab-ce/issues/36791
+      Ci::Build.finished.with_live_trace.find_each(batch_size: 100) do |build|
+        begin
+          build.trace.archive!
+        rescue => e
+          Rails.logger.error "Failed to archive stale live trace. id: #{build.id} message: #{e.message}"
         end
       end
     end