Allow move to failed, from pending or failed

Changelog: fixed
EE: true

ee/app/models/concerns/geo/replicable_registry.rb

@@ -44,6 +44,13 @@ def fail_sync_timeouts
     end
   end
 
+  # Overridden by Geo::VerifiableRegistry
+  def before_pending
+    self.retry_at = nil
+    self.retry_count = 0
+    self.last_synced_at = nil
+  end
+
   def before_synced
     self.retry_count = 0
     self.last_sync_failure = nil
@@ -84,9 +91,7 @@ def replicator_class
       end
 
       before_transition any => :pending do |registry, _|
-        registry.retry_at = nil
-        registry.retry_count = 0
-        registry.last_synced_at = nil
+        registry.before_pending
       end
 
       before_transition any => :failed do |registry, _|
@@ -111,7 +116,7 @@ def replicator_class
       end
 
       event :failed do
-        transition [:started, :synced] => :failed
+        transition [:pending, :started, :synced, :failed] => :failed
       end
 
       event :resync do

ee/app/models/concerns/geo/verifiable_registry.rb

@@ -108,6 +108,13 @@ def verification_fields_default?
       end
     end
 
+    override :before_pending
+    def before_pending
+      super
+
+      self.verification_disabled
+    end
+
     override :after_synced
     def after_synced
       unless ready_to_verify?

ee/spec/support/shared_examples/models/geo_framework_registry_shared_examples.rb

@@ -181,6 +181,29 @@
         expect(registry.retry_at).to be_within(10.minutes).of(4.hours.from_now)
       end
     end
+
+    it 'can transition from any state' do
+      # initial state is started
+      registry.failed!(message: message)
+
+      expect(registry.reload.failed?).to be_truthy
+
+      registry.pending!
+
+      registry.failed!(message: message)
+
+      expect(registry.reload.failed?).to be_truthy
+
+      registry.failed!(message: message)
+
+      expect(registry.reload.failed?).to be_truthy
+
+      registry.synced!
+
+      registry.failed!(message: message)
+
+      expect(registry.reload.failed?).to be_truthy
+    end
   end
 
   describe '#synced!' do

ee/spec/support/shared_examples/models/geo_verifiable_registry_shared_examples.rb

@@ -43,6 +43,28 @@
         end
       end
     end
+
+    context 'when transitioning to pending' do
+      context 'when synced' do
+        let(:registry) { create(registry_class_factory, :synced) }
+
+        it 'marks verification as disabled' do
+          registry.pending!
+
+          expect(registry.reload).to be_verification_disabled
+        end
+      end
+
+      context 'when failed' do
+        let(:registry) { create(registry_class_factory, :failed) }
+
+        it 'marks verification as disabled' do
+          registry.pending!
+
+          expect(registry.reload).to be_verification_disabled
+        end
+      end
+    end
   end
 
   context 'verification_state machine' do