Commit 0262ed90 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'live-trace-v2' of gitlab.com:gitlab-org/gitlab-ce into live-trace-v2

parents fd8a63f7 ac6eb51b
...@@ -92,7 +92,7 @@ module Ci ...@@ -92,7 +92,7 @@ module Ci
def schedule_to_db def schedule_to_db
return if db? return if db?
SwapTraceChunkWorker.perform_async(id) BuildTraceSwapChunkWorker.perform_async(id)
end end
def fullfilled? def fullfilled?
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- pipeline_processing:pipeline_update - pipeline_processing:pipeline_update
- pipeline_processing:stage_update - pipeline_processing:stage_update
- pipeline_processing:update_head_pipeline_for_merge_request - pipeline_processing:update_head_pipeline_for_merge_request
- pipeline_processing:swap_trace_chunk - pipeline_processing:build_trace_swap_chunk
- repository_check:repository_check_clear - repository_check:repository_check_clear
- repository_check:repository_check_single_repository - repository_check:repository_check_single_repository
......
class SwapTraceChunkWorker class BuildTraceSwapChunkWorker
include ApplicationWorker include ApplicationWorker
include PipelineQueue include PipelineQueue
......
...@@ -71,7 +71,7 @@ describe Ci::JobTraceChunk, :clean_gitlab_redis_shared_state do ...@@ -71,7 +71,7 @@ describe Ci::JobTraceChunk, :clean_gitlab_redis_shared_state do
let(:value) { 'a' * described_class::CHUNK_SIZE } let(:value) { 'a' * described_class::CHUNK_SIZE }
it 'schedules stashing data' do it 'schedules stashing data' do
expect(SwapTraceChunkWorker).to receive(:perform_async).once expect(BuildTraceSwapChunkWorker).to receive(:perform_async).once
subject subject
end end
...@@ -108,7 +108,7 @@ describe Ci::JobTraceChunk, :clean_gitlab_redis_shared_state do ...@@ -108,7 +108,7 @@ describe Ci::JobTraceChunk, :clean_gitlab_redis_shared_state do
context 'when fullfilled chunk size' do context 'when fullfilled chunk size' do
it 'does not schedule stashing data' do it 'does not schedule stashing data' do
expect(SwapTraceChunkWorker).not_to receive(:perform_async) expect(BuildTraceSwapChunkWorker).not_to receive(:perform_async)
subject subject
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