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
c76c514f
Commit
c76c514f
authored
Jan 28, 2020
by
nmilojevic1
Committed by
Peter Leitzen
Jan 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add retry mechanisam to after import
- use import_failure_service - add missing specs
parent
c785530c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
2 deletions
+55
-2
app/services/projects/after_import_service.rb
app/services/projects/after_import_service.rb
+7
-1
spec/services/projects/after_import_service_spec.rb
spec/services/projects/after_import_service_spec.rb
+48
-1
No files found.
app/services/projects/after_import_service.rb
View file @
c76c514f
...
...
@@ -12,7 +12,9 @@ module Projects
service
=
Projects
::
HousekeepingService
.
new
(
@project
)
service
.
execute
do
repository
.
delete_all_refs_except
(
RESERVED_REF_PREFIXES
)
import_failure_service
.
with_retry
(
action:
'delete_all_refs'
)
do
repository
.
delete_all_refs_except
(
RESERVED_REF_PREFIXES
)
end
end
# Right now we don't actually have a way to know if a project
...
...
@@ -26,6 +28,10 @@ module Projects
private
def
import_failure_service
@import_failure_service
||=
Gitlab
::
ImportExport
::
ImportFailureService
.
new
(
@project
)
end
def
repository
@repository
||=
@project
.
repository
end
...
...
spec/services/projects/after_import_service_spec.rb
View file @
c76c514f
...
...
@@ -20,7 +20,7 @@ describe Projects::AfterImportService do
allow
(
housekeeping_service
)
.
to
receive
(
:execute
).
and_yield
expect
(
housekeeping_service
).
to
receive
(
:increment!
)
allow
(
housekeeping_service
).
to
receive
(
:increment!
)
end
it
'performs housekeeping'
do
...
...
@@ -58,6 +58,53 @@ describe Projects::AfterImportService do
end
end
context
'when after import action throw non-retriable exception'
do
let
(
:exception
)
{
StandardError
.
new
(
'after import error'
)
}
before
do
allow
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_raise
(
exception
)
end
it
'throws after import error'
do
expect
{
subject
.
execute
}.
to
raise_exception
(
'after import error'
)
end
end
context
'when after import action throw retriable exception one time'
do
let
(
:exception
)
{
GRPC
::
DeadlineExceeded
.
new
}
before
do
repository
.
write_ref
(
'refs/pull/1/head'
,
sha
)
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_raise
(
exception
)
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_call_original
subject
.
execute
end
it
'removes refs/pull/**/*'
do
expect
(
rugged
.
references
.
map
(
&
:name
))
.
not_to
include
(
%r{
\A
refs/pull/}
)
end
it
'records the failures in the database'
,
:aggregate_failures
do
import_failure
=
ImportFailure
.
last
expect
(
import_failure
.
source
).
to
eq
(
'delete_all_refs'
)
expect
(
import_failure
.
project_id
).
to
eq
(
project
.
id
)
expect
(
import_failure
.
relation_key
).
to
be_nil
expect
(
import_failure
.
relation_index
).
to
be_nil
expect
(
import_failure
.
exception_class
).
to
eq
(
'GRPC::DeadlineExceeded'
)
expect
(
import_failure
.
exception_message
).
to
be_present
expect
(
import_failure
.
correlation_id_value
).
not_to
be_empty
end
end
def
rugged
rugged_repo
(
repository
)
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