Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
bdedddb74ed8
Commit
2822526e
authored
Oct 27, 2016
by
Kamil Trzcinski
Browse files
Make retry_lock to not be infinite
parent
71bbdc3bb4d6
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/services/ci/process_pipeline_service.rb
View file @
bdedddb7
...
...
@@ -31,8 +31,8 @@ def process_stage(index)
if
HasStatus
::
COMPLETED_STATUSES
.
include?
(
current_status
)
created_builds_in_stage
(
index
).
select
do
|
build
|
Gitlab
::
OptimisticLocking
.
retry_lock
(
build
)
do
|
build
|
process_build
(
build
,
current_status
)
Gitlab
::
OptimisticLocking
.
retry_lock
(
build
)
do
|
subject
|
process_build
(
subject
,
current_status
)
end
end
end
...
...
lib/gitlab/optimistic_locking.rb
View file @
bdedddb7
module
Gitlab
class
OptimisticLocking
def
self
.
retry_lock
(
subject
,
&
block
)
module
OptimisticLocking
extend
self
def
retry_lock
(
subject
,
retries
=
100
,
&
block
)
loop
do
begin
subject
.
transaction
do
ActiveRecord
::
Base
.
transaction
do
return
block
.
call
(
subject
)
end
rescue
ActiveRecord
::
StaleObjectError
retries
-=
1
raise
unless
retries
>=
0
subject
.
reload
end
end
...
...
spec/lib/gitlab/optimistic_locking_spec.rb
View file @
bdedddb7
...
...
@@ -24,5 +24,16 @@
subject
.
drop
end
end
it
'raises exception when too many retries'
do
expect
(
pipeline
).
to
receive
(
:drop
).
twice
.
and_call_original
expect
do
described_class
.
retry_lock
(
pipeline
,
1
)
do
|
subject
|
subject
.
lock_version
=
100
subject
.
drop
end
end
.
to
raise_error
(
ActiveRecord
::
StaleObjectError
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment