Merge branch '1997-geo-better-handle-git-failures' into 'master'

Resolve "Geo: Better handle SSH/git failures"

Closes #1997

See merge request !1542

app/workers/geo_repository_fetch_worker.rb

 class GeoRepositoryFetchWorker
   include Sidekiq::Worker
+  include ::GeoDynamicBackoff
+  include GeoQueue
   include Gitlab::ShellAdapter
+
   sidekiq_options queue: 'geo_repository_update'
 
   def perform(project_id, clone_url)
@@ -12,5 +15,7 @@ class GeoRepositoryFetchWorker
     project.repository.expire_all_method_caches
     project.repository.expire_branch_cache
     project.repository.expire_content_cache
+  rescue Gitlab::Shell::Error => e
+    logger.error "Error fetching repository for project #{project.path_with_namespace}: #{e}"
   end
 end

changelogs/unreleased-ee/1997-geo-better-handle-git-failures.yml

+---
+title: 'Geo: handle git failures on GeoRepositoryFetchWorker'
+merge_request:
+author:

spec/workers/geo_repository_fetch_worker_spec.rb

@@ -40,6 +40,12 @@ describe GeoRepositoryFetchWorker do
 
       perform
     end
+
+    it 'does not raise exception when git failures occurs' do
+      expect_any_instance_of(Repository).to receive(:fetch_geo_mirror).and_raise(Gitlab::Shell::Error)
+
+      expect { perform }.not_to raise_error
+    end
   end
 
   def perform