Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bf98a0f1
Commit
bf98a0f1
authored
Jun 23, 2017
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use an ExclusiveLease to prevent multiple instances of LogCursor to run
parent
d08b3f75
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
6 deletions
+45
-6
lib/gitlab/geo/log_cursor/daemon.rb
lib/gitlab/geo/log_cursor/daemon.rb
+1
-1
lib/gitlab/geo/log_cursor/events.rb
lib/gitlab/geo/log_cursor/events.rb
+38
-5
spec/lib/gitlab/geo/log_cursor/events_spec.rb
spec/lib/gitlab/geo/log_cursor/events_spec.rb
+6
-0
No files found.
lib/gitlab/geo/log_cursor/daemon.rb
View file @
bf98a0f1
...
@@ -82,7 +82,7 @@ module Gitlab
...
@@ -82,7 +82,7 @@ module Gitlab
end
end
def
handle_repository_update
(
updated_event
)
def
handle_repository_update
(
updated_event
)
registry
=
::
Geo
::
ProjectRegistry
.
find_or_
creat
e_by
(
project_id:
project_id
)
registry
=
::
Geo
::
ProjectRegistry
.
find_or_
initializ
e_by
(
project_id:
project_id
)
case
updated_event
.
source
case
updated_event
.
source
when
'repository'
when
'repository'
...
...
lib/gitlab/geo/log_cursor/events.rb
View file @
bf98a0f1
...
@@ -5,19 +5,25 @@ module Gitlab
...
@@ -5,19 +5,25 @@ module Gitlab
class
Events
class
Events
BATCH_SIZE
=
50
BATCH_SIZE
=
50
NAMESPACE
=
'geo:gitlab'
.
freeze
NAMESPACE
=
'geo:gitlab'
.
freeze
LEASE_TIMEOUT
=
5
.
minutes
.
freeze
LEASE_KEY
=
'geo_log_cursor_processed'
.
freeze
# fetches up to BATCH_SIZE next events and keep track of batches
# fetches up to BATCH_SIZE next events and keep track of batches
def
self
.
fetch_in_batches
def
self
.
fetch_in_batches
try_obtain_lease
do
::
Geo
::
EventLog
.
where
(
'id > ?'
,
last_processed
).
find_in_batches
(
batch_size:
BATCH_SIZE
)
do
|
batch
|
::
Geo
::
EventLog
.
where
(
'id > ?'
,
last_processed
).
find_in_batches
(
batch_size:
BATCH_SIZE
)
do
|
batch
|
yield
batch
yield
batch
save_processed
(
batch
.
last
.
id
)
save_processed
(
batch
.
last
.
id
)
renew_lease!
end
end
end
end
end
# saves last replicated event
# saves last replicated event
def
self
.
save_processed
(
event_id
)
def
self
.
save_processed
(
event_id
)
::
Geo
::
EventLogState
.
create!
(
event_id:
event_id
)
event_state
=
::
Geo
::
EventLogState
.
last
||
::
Geo
::
EventLogState
.
new
::
Geo
::
EventLogState
.
where
(
'event_id < ?'
,
event_id
).
delete_all
event_state
.
update!
(
event_id:
event_id
)
end
end
# @return [Integer] id of last replicated event
# @return [Integer] id of last replicated event
...
@@ -27,6 +33,33 @@ module Gitlab
...
@@ -27,6 +33,33 @@ module Gitlab
::
Geo
::
EventLog
.
any?
?
::
Geo
::
EventLog
.
last
.
id
:
-
1
::
Geo
::
EventLog
.
any?
?
::
Geo
::
EventLog
.
last
.
id
:
-
1
end
end
# private methods
def
self
.
try_obtain_lease
lease
=
exclusive_lease
.
try_obtain
unless
lease
$stdout
.
puts
'Cannot obtain an exclusive lease. There must be another process already in execution.'
return
end
begin
yield
lease
ensure
Gitlab
::
ExclusiveLease
.
cancel
(
LEASE_KEY
,
lease
)
end
end
def
self
.
renew_lease!
exclusive_lease
.
renew
end
def
self
.
exclusive_lease
@lease
||=
Gitlab
::
ExclusiveLease
.
new
(
LEASE_KEY
,
timeout:
LEASE_TIMEOUT
)
end
private_class_method
:try_obtain_lease
,
:exclusive_lease
end
end
end
end
end
end
...
...
spec/lib/gitlab/geo/log_cursor/events_spec.rb
View file @
bf98a0f1
...
@@ -17,6 +17,12 @@ describe Gitlab::Geo::LogCursor::Events, lib: true do
...
@@ -17,6 +17,12 @@ describe Gitlab::Geo::LogCursor::Events, lib: true do
described_class
.
fetch_in_batches
{
|
batch
|
batch
}
described_class
.
fetch_in_batches
{
|
batch
|
batch
}
end
end
it
'skips execution if cannot achieve a lease'
do
expect_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
)
{
}
expect
{
|
b
|
described_class
.
fetch_in_batches
(
&
b
)
}.
not_to
yield_control
end
end
end
describe
'.save_processed'
do
describe
'.save_processed'
do
...
...
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