Automatic merge of gitlab-org/gitlab master

doc/development/migration_style_guide.md

@@ -516,12 +516,14 @@ class MyMigration < ActiveRecord::Migration[6.0]
 
   disable_ddl_transaction!
 
+  INDEX_NAME = 'index_name'
+
   def up
-    add_concurrent_index :table, :column
+    add_concurrent_index :table, :column, name: INDEX_NAME
   end
 
   def down
-    remove_concurrent_index :table, :column, name: index_name
+    remove_concurrent_index :table, :column, name: INDEX_NAME
   end
 end
 ```

ee/app/services/geo/file_download_service.rb

@@ -79,9 +79,11 @@ module Geo
       retry_later = !registry.success || registry.missing_on_primary
 
       if retry_later
+        custom_max_wait_time = missing_on_primary ? 4.hours : nil
+
         # We don't limit the amount of retries
         registry.retry_count = (registry.retry_count || 0) + 1
-        registry.retry_at = next_retry_time(registry.retry_count)
+        registry.retry_at = next_retry_time(registry.retry_count, custom_max_wait_time)
       else
         registry.retry_count = 0
         registry.retry_at = nil

ee/changelogs/unreleased/mk-increase-backoff-cap-for-legacy-blobs.yml

+---
+title: 'Geo: Increase backoff cap for Job artifacts, LFS objects, and Uploads which are missing on primary'
+merge_request: 50812
+author:
+type: changed

ee/lib/delay.rb

@@ -8,9 +8,10 @@ module Delay
 
   # To prevent the retry time from storing invalid dates in the database,
   # cap the max time to a hour plus some random jitter value.
-  def next_retry_time(retry_count)
+  def next_retry_time(retry_count, custom_max_wait_time = nil)
     proposed_time = Time.now + delay(retry_count).seconds
-    max_future_time = 1.hour.from_now + delay(1).seconds
+    max_wait_time = custom_max_wait_time || 1.hour
+    max_future_time = max_wait_time.from_now + delay(1).seconds
 
     [proposed_time, max_future_time].min
   end

ee/spec/services/geo/file_download_service_spec.rb

@@ -323,13 +323,13 @@ RSpec.describe Geo::FileDownloadService do
             end
           end
 
-          it 'sets a retry date with a maximum of about 7 days' do
-            registry_entry.update!(retry_count: 100, retry_at: 7.days.from_now)
+          it 'sets a retry date with a maximum of about 4 hours' do
+            registry_entry.update!(retry_count: 100, retry_at: 1.minute.ago)
 
             freeze_time do
               execute!
 
-              expect(registry_entry.reload.retry_at < 8.days.from_now).to be_truthy
+              expect(registry_entry.reload.retry_at).to be_within(3.minutes).of(4.hours.from_now)
             end
           end
         end
@@ -362,13 +362,13 @@ RSpec.describe Geo::FileDownloadService do
             end
           end
 
-          it 'sets a retry date with a maximum of about 7 days' do
-            registry_entry.update!(retry_count: 100, retry_at: 7.days.from_now)
+          it 'sets a retry date with a maximum of about 1 hour' do
+            registry_entry.update!(retry_count: 100, retry_at: 1.minute.ago)
 
             freeze_time do
               execute!
 
-              expect(registry_entry.reload.retry_at < 8.days.from_now).to be_truthy
+              expect(registry_entry.reload.retry_at).to be_within(3.minutes).of(1.hour.from_now)
             end
           end
         end