Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'

Mark mirrors as failed 1 hour after they started

See merge request gitlab-org/gitlab-ce!30999

app/models/remote_mirror.rb

@@ -31,7 +31,7 @@ class RemoteMirror < ApplicationRecord
   scope :enabled, -> { where(enabled: true) }
   scope :started, -> { with_update_status(:started) }
-  scope :stuck,   -> { started.where('last_update_at < ? OR (last_update_at IS NULL AND updated_at < ?)', 1.day.ago, 1.day.ago) }
+  scope :stuck,   -> { started.where('last_update_at < ? OR (last_update_at IS NULL AND updated_at < ?)', 1.hour.ago, 3.hours.ago) }
   state_machine :update_status, initial: :none do
     event :update_start do
@@ -173,7 +173,7 @@ class RemoteMirror < ApplicationRecord
     result = URI.parse(url)
     result.password = '*****' if result.password
-    result.user = '*****' if result.user && result.user != "git" # tokens or other data may be saved as user
+    result.user = '*****' if result.user && result.user != 'git' # tokens or other data may be saved as user
     result.to_s
   end

changelogs/unreleased/bvl-mark-remote-mirrors-as-failed-sooner.yml

+---
+title: Mark push mirrors as failed after 1 hour
+merge_request: 30999
+author:
+type: changed

spec/models/remote_mirror_spec.rb

@@ -113,7 +113,7 @@ describe RemoteMirror, :mailer do
         remote_mirror = create(:remote_mirror)
-        expect(remote_mirror.remote_name).to eq("remote_mirror_secret")
+        expect(remote_mirror.remote_name).to eq('remote_mirror_secret')
       end
     end
@@ -201,11 +201,20 @@ describe RemoteMirror, :mailer do
   end
   context 'stuck mirrors' do
-    it 'includes mirrors stuck in started with no last_update_at set' do
+    it 'includes mirrors that were started over an hour ago' do
+      mirror = create_mirror(url: 'http://cantbeblank',
+                             update_status: 'started',
+                             last_update_at: 3.hours.ago,
+                             updated_at: 2.hours.ago)
+
+      expect(described_class.stuck.last).to eq(mirror)
+    end
+
+    it 'includes mirrors started over 3 hours ago for their first sync' do
       mirror = create_mirror(url: 'http://cantbeblank',
                              update_status: 'started',
                              last_update_at: nil,
-                             updated_at: 25.hours.ago)
+                             updated_at: 4.hours.ago)
       expect(described_class.stuck.last).to eq(mirror)
     end