diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/trace.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/ci/trace/chunked_io.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index 79838cabdb5..af86b47adb8 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -100,7 +100,7 @@ module Gitlab FileUtils.rm(trace_path, force: true) end - job.chunks.destroy_all + job.chunks.delete_all job.erase_old_trace! end @@ -111,7 +111,7 @@ module Gitlab if job.chunks.any? Gitlab::Ci::Trace::ChunkedIO.new(job) do |stream| archive_stream!(stream) - stream.destroy! + stream.delete! end elsif current_path File.open(current_path) do |stream| diff --git a/lib/gitlab/ci/trace/chunked_io.rb b/lib/gitlab/ci/trace/chunked_io.rb index 6b4a9f61961..7661c194a40 100644 --- a/lib/gitlab/ci/trace/chunked_io.rb +++ b/lib/gitlab/ci/trace/chunked_io.rb @@ -140,7 +140,7 @@ module Gitlab @size = offset # remove all next chunks - job_chunks.where('chunk_index > ?', chunk_index).destroy_all + job_chunks.where('chunk_index > ?', chunk_index).delete_all # truncate current chunk current_chunk.truncate(chunk_offset) if chunk_offset != 0 @@ -156,8 +156,8 @@ module Gitlab true end - def destroy! - job_chunks.destroy_all + def delete! + job_chunks.delete_all @tell = @size = 0 ensure invalidate_chunk_cache |