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
4007551e
Commit
4007551e
authored
Aug 02, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Require a lease to perform repositories cleanup on secondaries nodes
parent
34437208
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
6 deletions
+51
-6
app/workers/geo/repositories_clean_up_worker.rb
app/workers/geo/repositories_clean_up_worker.rb
+37
-6
spec/workers/geo/repositories_clean_up_worker_spec.rb
spec/workers/geo/repositories_clean_up_worker_spec.rb
+14
-0
No files found.
app/workers/geo/repositories_clean_up_worker.rb
View file @
4007551e
...
...
@@ -4,8 +4,11 @@ module Geo
include
GeoQueue
BATCH_SIZE
=
250
LEASE_TIMEOUT
=
60
.
minutes
def
perform
(
geo_node_id
)
# Prevent multiple Sidekiq workers from performing repositories clean up
try_obtain_lease
do
geo_node
=
GeoNode
.
find
(
geo_node_id
)
restricted_project_ids
=
geo_node
.
project_ids
...
...
@@ -16,6 +19,7 @@ module Geo
clean_up_repositories
(
project
)
end
end
end
rescue
ActiveRecord
::
RecordNotFound
=>
e
log_error
(
'Could not find Geo node, skipping repositories clean up'
,
geo_node_id:
geo_node_id
,
error:
e
)
end
...
...
@@ -32,6 +36,33 @@ module Geo
end
end
def
try_obtain_lease
lease
=
exclusive_lease
.
try_obtain
unless
lease
log_error
(
'Cannot obtain an exclusive lease. There must be another worker already in execution.'
)
return
end
begin
yield
lease
ensure
release_lease
(
lease
)
end
end
def
lease_key
@lease_key
||=
self
.
class
.
name
.
underscore
end
def
exclusive_lease
@lease
||=
Gitlab
::
ExclusiveLease
.
new
(
lease_key
,
timeout:
LEASE_TIMEOUT
)
end
def
release_lease
(
uuid
)
Gitlab
::
ExclusiveLease
.
cancel
(
lease_key
,
uuid
)
end
def
log_info
(
message
,
params
=
{})
Gitlab
::
Geo
::
Logger
.
info
({
class:
self
.
class
.
name
,
message:
message
}.
merge
(
params
))
end
...
...
spec/workers/geo/repositories_clean_up_worker_spec.rb
View file @
4007551e
...
...
@@ -7,6 +7,10 @@ describe Geo::RepositoriesCleanUpWorker do
let!
(
:project_2
)
{
create
(
:empty_project
)
}
describe
'#perform'
do
before
do
allow_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
)
{
true
}
end
context
'when node has namespace restrictions'
do
it
'performs GeoRepositoryDestroyWorker for each project that do not belong to selected namespaces to replicate'
do
geo_node
.
update_attribute
(
:namespaces
,
[
group
])
...
...
@@ -27,6 +31,16 @@ describe Geo::RepositoriesCleanUpWorker do
end
end
context
'when cannnot obtain a lease'
do
it
'does not perform GeoRepositoryDestroyWorker'
do
allow_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
)
{
false
}
expect
(
GeoRepositoryDestroyWorker
).
not_to
receive
(
:perform_async
)
subject
.
perform
(
geo_node
.
id
)
end
end
context
'when Geo node could not be found'
do
it
'does not raise an error'
do
expect
{
subject
.
perform
(
-
1
)
}.
not_to
raise_error
...
...
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