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
bccbd8ca
Commit
bccbd8ca
authored
Oct 02, 2020
by
Mike Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Geo: Fix resync after project repo storage move
https://gitlab.com/gitlab-org/gitlab/-/issues/260337
parent
78852307
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
ee/app/services/geo/repository_base_sync_service.rb
ee/app/services/geo/repository_base_sync_service.rb
+6
-0
ee/changelogs/unreleased/mk-fix-secondary-not-resyncing-repo-after-migrate-storage.yml
...ix-secondary-not-resyncing-repo-after-migrate-storage.yml
+5
-0
ee/spec/services/geo/repository_sync_service_spec.rb
ee/spec/services/geo/repository_sync_service_spec.rb
+1
-1
ee/spec/services/geo/wiki_sync_service_spec.rb
ee/spec/services/geo/wiki_sync_service_spec.rb
+1
-1
No files found.
ee/app/services/geo/repository_base_sync_service.rb
View file @
bccbd8ca
...
...
@@ -48,6 +48,12 @@ module Geo
log_info
(
"Trying to fetch
#{
type
}
"
)
clean_up_temporary_repository
# TODO: Remove this as part of
# https://gitlab.com/gitlab-org/gitlab/-/issues/9803
# This line is a workaround to avoid broken project repos in Geo
# secondaries after migrating repos to a different storage.
repository
.
expire_exists_cache
if
redownload?
redownload_repository
@new_repository
=
true
...
...
ee/changelogs/unreleased/mk-fix-secondary-not-resyncing-repo-after-migrate-storage.yml
0 → 100644
View file @
bccbd8ca
---
title
:
'
Geo:
Fix
"Project
repo
not
able
to
resync
after
storage
move"'
merge_request
:
44172
author
:
type
:
fixed
ee/spec/services/geo/repository_sync_service_spec.rb
View file @
bccbd8ca
...
...
@@ -407,7 +407,7 @@ RSpec.describe Geo::RepositorySyncService, :geo do
force_to_redownload_repository:
true
)
expect
(
project
.
repository
).
to
receive
(
:expire_exists_cache
).
twice
.
and_call_original
expect
(
project
.
repository
).
to
receive
(
:expire_exists_cache
).
exactly
(
3
).
times
.
and_call_original
expect
(
subject
).
not_to
receive
(
:fail_registry_sync!
)
subject
.
execute
...
...
ee/spec/services/geo/wiki_sync_service_spec.rb
View file @
bccbd8ca
...
...
@@ -233,7 +233,7 @@ RSpec.describe Geo::WikiSyncService, :geo do
force_to_redownload_wiki:
true
)
expect
(
project
.
wiki
.
repository
).
to
receive
(
:expire_exists_cache
).
twice
.
and_call_original
expect
(
project
.
wiki
.
repository
).
to
receive
(
:expire_exists_cache
).
exactly
(
3
).
times
.
and_call_original
expect
(
subject
).
not_to
receive
(
:fail_registry_sync!
)
subject
.
execute
...
...
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