Merge branch 'remove-trace-efficiently' into 'master'

Remove redundant query when removing trace

See merge request gitlab-org/gitlab-ce!20324

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index bf93a2caf72..19949f83351 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -386,6 +386,10 @@ module Ci
       trace.exist?
     end
 
+    def has_old_trace?
+      old_trace.present?
+    end
+
     def trace=(data)
       raise NotImplementedError
     end
@@ -395,6 +399,8 @@ module Ci
     end
 
     def erase_old_trace!
+      return unless has_old_trace?
+
       update_column(:trace, nil)
     end