Commit 40644815 authored by Shinya Maeda's avatar Shinya Maeda

Rename find_stale_in_batches to find_builds_from_stale_live_trace. Fix comments

parent 2522691e
......@@ -52,13 +52,13 @@ module Ci
end
# Find stale live traces and return their build ids
def find_stale_in_batches(finished_before: 1.hour.ago)
def find_builds_from_stale_live_trace
include(EachBatch)
.select(:build_id)
.group(:build_id)
.joins(:build)
.merge(Ci::Build.finished)
.where('ci_builds.finished_at < ?', finished_before)
.where('ci_builds.finished_at < ?', 1.hour.ago)
.each_batch(column: :build_id) do |chunks|
build_ids = chunks.map { |chunk| chunk.build_id }
......
......@@ -4,12 +4,10 @@ module Ci
include CronjobQueue
def perform
# Reschedule to archive live traces
#
# The targets are jobs with the following conditions
# - Jobs had been finished 1 hour ago, but they don't have an archived trace yet
# This could happen when their sidekiq-jobs are lost by SIGKILL
Ci::BuildTraceChunk.find_stale_in_batches(finished_before: 1.hour.ago) do |build_ids|
# 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::BuildTraceChunk.find_builds_from_stale_live_trace do |build_ids|
Ci::Build.where(id: build_ids).find_each do |build|
begin
build.trace.archive!
......
......@@ -35,8 +35,8 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
end
end
describe '.find_stale_in_batches' do
subject { described_class.find_stale_in_batches }
describe '.find_builds_from_stale_live_trace' do
subject { described_class.find_builds_from_stale_live_trace }
context 'when build status is finished' do
context 'when build finished 2 days ago' do
......@@ -44,7 +44,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state 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_stale_in_batches(&b) }.not_to yield_control
expect { |b| described_class.find_builds_from_stale_live_trace(&b) }.not_to yield_control
end
end
......@@ -52,7 +52,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
let!(:build) { create(:ci_build, :success, :trace_live, finished_at: 2.days.ago) }
it 'yields build id' do
expect { |b| described_class.find_stale_in_batches(&b) }.to yield_with_args([build.id])
expect { |b| described_class.find_builds_from_stale_live_trace(&b) }.to yield_with_args([build.id])
end
end
end
......@@ -61,7 +61,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state 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_stale_in_batches(&b) }.not_to yield_control
expect { |b| described_class.find_builds_from_stale_live_trace(&b) }.not_to yield_control
end
end
end
......@@ -70,7 +70,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
let!(:build) { create(:ci_build, :running, :trace_live) }
it 'does not yield build id' do
expect { |b| described_class.find_stale_in_batches(&b) }.not_to yield_control
expect { |b| described_class.find_builds_from_stale_live_trace(&b) }.not_to yield_control
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment