Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/set-higher-ttl-for-trace-write.yml

+---
+title: Set higher TTL for write lock of trace to prevent concurrent archiving
+merge_request: 30064
+author:
+type: fixed

lib/gitlab/ci/trace.rb

@@ -5,7 +5,7 @@ module Gitlab
     class Trace
       include ::Gitlab::ExclusiveLeaseHelpers
 
-      LOCK_TTL = 1.minute
+      LOCK_TTL = 10.minutes
       LOCK_RETRIES = 2
       LOCK_SLEEP = 0.001.seconds
 

spec/support/shared_examples/ci_trace_shared_examples.rb

@@ -270,7 +270,7 @@ shared_examples_for 'common trace features' do
           include ExclusiveLeaseHelpers
 
           before do
-            stub_exclusive_lease_taken("trace:write:lock:#{trace.job.id}", timeout: 1.minute)
+            stub_exclusive_lease_taken("trace:write:lock:#{trace.job.id}", timeout: 10.minutes)
           end
 
           it 'blocks concurrent archiving' do