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
cdd7dfc4
Commit
cdd7dfc4
authored
Jun 12, 2018
by
Jan Provaznik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Override exclusive_lease_key method in RecordsUpload
parent
c3f499e7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
app/uploaders/object_storage.rb
app/uploaders/object_storage.rb
+10
-6
No files found.
app/uploaders/object_storage.rb
View file @
cdd7dfc4
...
@@ -62,6 +62,15 @@ module ObjectStorage
...
@@ -62,6 +62,15 @@ module ObjectStorage
upload
.
id
)
upload
.
id
)
end
end
def
exclusive_lease_key
# For FileUploaders, model may have many uploaders. In that case
# we want to use exclusive key per upload, not per model to allow
# parallel migration
key_object
=
upload
?
upload
:
model
"object_storage_migrate:
#{
key_object
.
class
}
:
#{
key_object
.
id
}
"
end
private
private
def
current_upload_satisfies?
(
paths
,
model
)
def
current_upload_satisfies?
(
paths
,
model
)
...
@@ -299,12 +308,7 @@ module ObjectStorage
...
@@ -299,12 +308,7 @@ module ObjectStorage
end
end
def
exclusive_lease_key
def
exclusive_lease_key
# For FileUploaders, model may have many uploaders. In that case
"object_storage_migrate:
#{
model
.
class
}
:
#{
model
.
id
}
"
# we want to use exclusive key per upload, not per model to allow
# parallel migration
key_object
=
self
.
is_a?
(
RecordsUploads
::
Concern
)
&&
upload
?
upload
:
model
"object_storage_migrate:
#{
key_object
.
class
}
:
#{
key_object
.
id
}
"
end
end
private
private
...
...
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