Merge branch '4919-reset-force-redownload' into 'master'

Resolve "Geo: If repo was set to be redownloaded once it will be redownloaded always"

Closes #4919

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

changelogs/unreleased-ee/4211-document-process-for-bring-a-demoted-primary-back-docs.yml

+---
+title: 'Geo: Reset force_redownload flag after successful sync'
+merge_request:
+author:
+type: fixed

ee/app/services/geo/base_sync_service.rb

@@ -108,6 +108,7 @@ module Geo
         attrs["resync_#{type}"] = false
         attrs["#{type}_retry_count"] = nil
         attrs["#{type}_retry_at"] = nil
+        attrs["force_to_redownload_#{type}"] = false
       end
 
       registry.update!(attrs)

ee/spec/services/geo/repository_sync_service_spec.rb

@@ -210,6 +210,14 @@ describe Geo::RepositorySyncService do
         subject.execute
       end
 
+      it 'sets the redownload flag to false after success' do
+        registry = create(:geo_project_registry, project: project, repository_retry_count: Geo::BaseSyncService::RETRY_BEFORE_REDOWNLOAD + 1, force_to_redownload_repository: true)
+
+        subject.execute
+
+        expect(registry.reload.force_to_redownload_repository).to be false
+      end
+
       it 'tries to redownload repo' do
         create(:geo_project_registry, project: project, repository_retry_count: Geo::BaseSyncService::RETRY_BEFORE_REDOWNLOAD + 1)