summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-04-24 14:53:14 +0900
committerShinya Maeda <shinya@gitlab.com>2018-04-24 14:53:14 +0900
commit94ce2233918b6b53411a015c245c2a8b2c6bfb96 (patch)
tree894b85461f7faa13b877264c3cd2ef496a75335f /lib/gitlab/ci
parentfd8a63f71e11c3bbc843013a859847a96a74b500 (diff)
downloadgitlab-ce-94ce2233918b6b53411a015c245c2a8b2c6bfb96.tar.gz
Swap redis chunks when build finished
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r--lib/gitlab/ci/trace.rb4
-rw-r--r--lib/gitlab/ci/trace/chunked_io.rb6
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