diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 18:09:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 18:09:44 +0300 |
commit | 34b3acb5a3a9b21490e45b81b81dca600b66521c (patch) | |
tree | 81deb74283f931cdbf65b8878b41085b0213a9e6 /lib/gitlab/ci/trace.rb | |
parent | effda22b3e6367cefd12666463b8409bf7e24cef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/trace.rb')
-rw-r--r-- | lib/gitlab/ci/trace.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index 348e5472cb4..6fd32b3f1a0 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -16,6 +16,7 @@ module Gitlab ArchiveError = Class.new(StandardError) AlreadyArchivedError = Class.new(StandardError) + LockedError = Class.new(StandardError) attr_reader :job @@ -130,6 +131,12 @@ module Gitlab end end + def lock(&block) + in_write_lock(&block) + rescue FailedToObtainLockError + raise LockedError, "build trace `#{job.id}` is locked" + end + private def read_stream |