Fix the query to select stale live traces

4 files changed, 33 insertions, 78 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 5e27cca6771..1b26c8d3b49 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -116,6 +116,26 @@ describe Ci::Build do
     end
   end
 
+  describe '.with_live_trace' do
+    subject { described_class.with_live_trace }
+
+    context 'when build has live trace' do
+      let!(:build) { create(:ci_build, :success, :trace_live) }
+
+      it 'selects the build' do
+        is_expected.to eq([build])
+      end
+    end
+
+    context 'when build does not have live trace' do
+      let!(:build) { create(:ci_build, :success, :trace_artifact) }
+
+      it 'selects the build' do
+        is_expected.to be_empty
+      end
+    end
+  end
+
   describe '#actionize' do
     context 'when build is a created' do
       before do
diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb
index 2dd8e935d62..cbcf1e55979 100644
--- a/spec/models/ci/build_trace_chunk_spec.rb
+++ b/spec/models/ci/build_trace_chunk_spec.rb
@@ -35,46 +35,6 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
     end
   end
 
-  describe '.find_builds_from_stale_live_traces' do
-    subject { described_class.find_builds_from_stale_live_traces }
-
-    context 'when build status is finished' do
-      context 'when build finished 2 days ago' do
-        context 'when build has an archived trace' do
-          let!(:build) { create(:ci_build, :success, :trace_artifact, finished_at: 2.days.ago) }
-
-          it 'does not yield build id' do
-            expect { |b| described_class.find_builds_from_stale_live_traces(&b) }.not_to yield_control
-          end
-        end
-
-        context 'when build has a live trace' do
-          let!(:build) { create(:ci_build, :success, :trace_live, finished_at: 2.days.ago) }
-
-          it 'yields build id' do
-            expect { |b| described_class.find_builds_from_stale_live_traces(&b) }.to yield_with_args([build.id])
-          end
-        end
-      end
-
-      context 'when build finished 10 minutes ago' do
-        let!(:build) { create(:ci_build, :success, :trace_live, finished_at: 10.minutes.ago) }
-
-        it 'does not yield build id' do
-          expect { |b| described_class.find_builds_from_stale_live_traces(&b) }.not_to yield_control
-        end
-      end
-    end
-
-    context 'when build status is running' do
-      let!(:build) { create(:ci_build, :running, :trace_live) }
-
-      it 'does not yield build id' do
-        expect { |b| described_class.find_builds_from_stale_live_traces(&b) }.not_to yield_control
-      end
-    end
-  end
-
   describe '#data' do
     subject { build_trace_chunk.data }
 
diff --git a/spec/workers/ci/rescue_stale_live_trace_worker_spec.rb b/spec/workers/ci/rescue_stale_live_trace_worker_spec.rb
index 6eee08fdbb5..0e3fbe2d3a9 100644
--- a/spec/workers/ci/rescue_stale_live_trace_worker_spec.rb
+++ b/spec/workers/ci/rescue_stale_live_trace_worker_spec.rb
@@ -25,57 +25,32 @@ describe Ci::RescueStaleLiveTraceWorker do
     end
   end
 
-  context 'when a job was succeeded 2 hours ago' do
+  context 'when a job was succeeded' do
     let!(:build) { create(:ci_build, :success, :trace_live) }
 
-    before do
-      build.update(finished_at: 2.hours.ago)
-    end
-
     it_behaves_like 'archives trace'
 
-    # context 'when build has both archived trace and live trace' do
-    #   let!(:build2) { create(:ci_build, :success, :trace_live, finished_at: 2.days.ago) }
+    context 'when archive raised an exception' do
+      let!(:build) { create(:ci_build, :success, :trace_artifact, :trace_live) }
+      let!(:build2) { create(:ci_build, :success, :trace_live) }
 
-    #   it 'archives only available targets' do
-    #     subject
-
-    #     build.reload
-    #     expect(build.job_artifacts_trace).to be_exist
-    #   end
-    # end
-  end
+      it 'archives valid targets' do
+        expect(Rails.logger).to receive(:error).with("Failed to archive stale live trace. id: #{build.id} message: Already archived")
 
-  context 'when a job was failed 2 hours ago' do
-    let!(:build) { create(:ci_build, :failed, :trace_live) }
+        subject
 
-    before do
-      build.update(finished_at: 2.hours.ago)
+        build2.reload
+        expect(build2.job_artifacts_trace).to be_exist
+      end
     end
-
-    it_behaves_like 'archives trace'
   end
 
-  context 'when a job was cancelled 2 hours ago' do
+  context 'when a job was cancelled' do
     let!(:build) { create(:ci_build, :canceled, :trace_live) }
 
-    before do
-      build.update(finished_at: 2.hours.ago)
-    end
-
     it_behaves_like 'archives trace'
   end
 
-  context 'when a job has been finished 10 minutes ago' do
-    let!(:build) { create(:ci_build, :success, :trace_live) }
-
-    before do
-      build.update(finished_at: 10.minutes.ago)
-    end
-
-    it_behaves_like 'does not archive trace'
-  end
-
   context 'when a job is running' do
     let!(:build) { create(:ci_build, :running, :trace_live) }
 
diff --git a/spec/workers/stuck_ci_jobs_worker_spec.rb b/spec/workers/stuck_ci_jobs_worker_spec.rb
index c3294fce5ea..2605c14334f 100644
--- a/spec/workers/stuck_ci_jobs_worker_spec.rb
+++ b/spec/workers/stuck_ci_jobs_worker_spec.rb
@@ -134,8 +134,8 @@ describe StuckCiJobsWorker do
     it 'cancels exclusive lease after worker perform' do
       worker.perform
 
-      expect(Gitlab::ExclusiveLease.new(described_class::EXCLUSIVE_LEASE_KEY, timeout: 1.hour).exists?)
-        .to be_falsy
+      expect(Gitlab::ExclusiveLease.new(described_class::EXCLUSIVE_LEASE_KEY, timeout: 1.hour))
+        .not_to be_exists
     end
   end
 end