Merge branch 'fix/geo-wiki-error' into 'master'

Fix wiki retry count typo

Closes #4177

See merge request gitlab-org/gitlab-ee!3569

app/services/geo/wiki_sync_service.rb

@@ -37,7 +37,7 @@ module Geo
     rescue Gitlab::Git::Repository::NoRepository => e
       log_error('Invalid wiki', e)
       registry.update(force_to_redownload_wiki: true,
-                      repository_retry_count: retry_count + 1)
+                      wiki_retry_count: retry_count + 1)
     ensure
       clean_up_temporary_repository if redownload
     end

changelogs/unreleased-ee/fix-geo-wiki-error.yml

+---
+title: Fix Geo wiki sync error not increasing retry count
+merge_request:
+author:
+type: fixed

spec/services/geo/repository_sync_service_spec.rb

@@ -90,6 +90,14 @@ describe Geo::RepositorySyncService do
       expect { subject.execute }.not_to raise_error
     end
 
+    it 'increases retry count when Gitlab::Git::Repository::NoRepository is raised' do
+      allow(repository).to receive(:fetch_as_mirror).with(url_to_repo, forced: true) { raise Gitlab::Git::Repository::NoRepository }
+
+      subject.execute
+
+      expect(Geo::ProjectRegistry.last.repository_retry_count).to eq(1)
+    end
+
     context 'tracking database' do
       it 'creates a new registry if does not exists' do
         expect { subject.execute }.to change(Geo::ProjectRegistry, :count).by(1)

spec/services/geo/wiki_sync_service_spec.rb

@@ -71,6 +71,14 @@ RSpec.describe Geo::WikiSyncService do
       expect { subject.execute }.not_to raise_error
     end
 
+    it 'increases retry count when Gitlab::Git::Repository::NoRepository is raised' do
+      allow(repository).to receive(:fetch_as_mirror).with(url_to_repo, forced: true) { raise Gitlab::Git::Repository::NoRepository }
+
+      subject.execute
+
+      expect(Geo::ProjectRegistry.last.wiki_retry_count).to eq(1)
+    end
+
     context 'tracking database' do
       it 'creates a new registry if does not exists' do
         expect { subject.execute }.to change(Geo::ProjectRegistry, :count).by(1)