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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
ae27a47b
Commit
ae27a47b
authored
Mar 28, 2018
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Gitlab::ExclusiveLease to ObjectStorage#use_file
parent
cb94afc5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
18 deletions
+72
-18
app/uploaders/object_storage.rb
app/uploaders/object_storage.rb
+29
-16
changelogs/unreleased/ac-fix-use_file-race.yml
changelogs/unreleased/ac-fix-use_file-race.yml
+5
-0
spec/support/shared_examples/uploaders/object_storage_shared_examples.rb
...ared_examples/uploaders/object_storage_shared_examples.rb
+14
-2
spec/uploaders/object_storage_spec.rb
spec/uploaders/object_storage_spec.rb
+24
-0
No files found.
app/uploaders/object_storage.rb
View file @
ae27a47b
...
...
@@ -228,16 +228,9 @@ module ObjectStorage
raise
'Failed to update object store'
unless
updated
end
def
use_file
if
file_storage?
return
yield
path
end
begin
cache_stored_file!
yield
cache_path
ensure
cache_storage
.
delete_dir!
(
cache_path
(
nil
))
def
use_file
(
&
blk
)
with_exclusive_lease
do
unsafe_use_file
(
&
blk
)
end
end
...
...
@@ -247,12 +240,9 @@ module ObjectStorage
# new_store: Enum (Store::LOCAL, Store::REMOTE)
#
def
migrate!
(
new_store
)
uuid
=
Gitlab
::
ExclusiveLease
.
new
(
exclusive_lease_key
,
timeout:
1
.
hour
.
to_i
).
try_obtain
raise
'Already running'
unless
uuid
unsafe_migrate!
(
new_store
)
ensure
Gitlab
::
ExclusiveLease
.
cancel
(
exclusive_lease_key
,
uuid
)
with_exclusive_lease
do
unsafe_migrate!
(
new_store
)
end
end
def
schedule_background_upload
(
*
args
)
...
...
@@ -384,6 +374,15 @@ module ObjectStorage
"object_storage_migrate:
#{
model
.
class
}
:
#{
model
.
id
}
"
end
def
with_exclusive_lease
uuid
=
Gitlab
::
ExclusiveLease
.
new
(
exclusive_lease_key
,
timeout:
1
.
hour
.
to_i
).
try_obtain
raise
'exclusive lease already taken'
unless
uuid
yield
uuid
ensure
Gitlab
::
ExclusiveLease
.
cancel
(
exclusive_lease_key
,
uuid
)
end
#
# Move the file to another store
#
...
...
@@ -418,4 +417,18 @@ module ObjectStorage
raise
e
end
end
def
unsafe_use_file
if
file_storage?
return
yield
path
end
begin
cache_stored_file!
yield
cache_path
ensure
FileUtils
.
rm_f
(
cache_path
)
cache_storage
.
delete_dir!
(
cache_path
(
nil
))
end
end
end
changelogs/unreleased/ac-fix-use_file-race.yml
0 → 100644
View file @
ae27a47b
---
title
:
Fix data race between ObjectStorage background_upload and Pages publishing
merge_request
:
author
:
type
:
fixed
spec/support/shared_examples/uploaders/object_storage_shared_examples.rb
View file @
ae27a47b
...
...
@@ -61,12 +61,18 @@ shared_examples "migrates" do |to_store:, from_store: nil|
expect
{
migrate
(
to
)
}.
not_to
change
{
file
.
exists?
}
end
context
'when migrate! is not o
qq
upied by another process'
do
context
'when migrate! is not o
cc
upied by another process'
do
it
'executes migrate!'
do
expect
(
subject
).
to
receive
(
:object_store
=
).
at_least
(
1
)
migrate
(
to
)
end
it
'executes use_file'
do
expect
(
subject
).
to
receive
(
:unsafe_use_file
).
once
subject
.
use_file
end
end
context
'when migrate! is occupied by another process'
do
...
...
@@ -79,7 +85,13 @@ shared_examples "migrates" do |to_store:, from_store: nil|
it
'does not execute migrate!'
do
expect
(
subject
).
not_to
receive
(
:unsafe_migrate!
)
expect
{
migrate
(
to
)
}.
to
raise_error
(
'Already running'
)
expect
{
migrate
(
to
)
}.
to
raise_error
(
'exclusive lease already taken'
)
end
it
'does not execute use_file'
do
expect
(
subject
).
not_to
receive
(
:unsafe_use_file
)
expect
{
subject
.
use_file
}.
to
raise_error
(
'exclusive lease already taken'
)
end
after
do
...
...
spec/uploaders/object_storage_spec.rb
View file @
ae27a47b
...
...
@@ -308,6 +308,30 @@ describe ObjectStorage do
it
{
is_expected
.
to
eq
(
remote_directory
)
}
end
context
'when file is in use'
do
def
when_file_is_in_use
uploader
.
use_file
do
yield
end
end
it
'cannot migrate'
do
when_file_is_in_use
do
expect
(
uploader
).
not_to
receive
(
:unsafe_migrate!
)
expect
{
uploader
.
migrate!
(
described_class
::
Store
::
REMOTE
)
}.
to
raise_error
(
'exclusive lease already taken'
)
end
end
it
'cannot use_file'
do
when_file_is_in_use
do
expect
(
uploader
).
not_to
receive
(
:unsafe_use_file
)
expect
{
uploader
.
use_file
}.
to
raise_error
(
'exclusive lease already taken'
)
end
end
end
describe
'#fog_credentials'
do
let
(
:connection
)
{
Settingslogic
.
new
(
"provider"
=>
"AWS"
)
}
...
...
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