summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/trace.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-05-07 12:01:32 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-05-07 12:01:32 +0000
commit965d0394d371f427ad0423bda2a6dc8867b31563 (patch)
tree2fbe613e05f2d95d1b793bfbfcf7c8453113d409 /lib/gitlab/ci/trace.rb
parentbf4073d53a988d7f31f2e099236041ed9f4f3b88 (diff)
parent1fd10d4f24778faae4c081b6c34921f6765b9929 (diff)
downloadgitlab-ce-965d0394d371f427ad0423bda2a6dc8867b31563.tar.gz
Merge branch 'live-trace-v2-efficient-destroy-all' into 'master'
Live trace: Use efficient destroy all (for `dependent: :destory` problem) See merge request gitlab-org/gitlab-ce!18575
Diffstat (limited to 'lib/gitlab/ci/trace.rb')
-rw-r--r--lib/gitlab/ci/trace.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index f46d1d39ea7..fe15fabc2e8 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.trace_chunks.destroy_all
+ job.trace_chunks.fast_destroy_all
job.erase_old_trace!
end