Merge branch 'mk/fix-secondary-not-resyncing-repo-after-migrate-storage' into 'master'

Geo: Fix "Project/wiki/design repo not able to resync after storage move"

See merge request gitlab-org/gitlab!44172

ee/app/services/geo/repository_base_sync_service.rb

@@ -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

+---
+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

@@ -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

@@ -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