Skip to content
Snippets Groups Projects
Commit 9f473420 authored by David Fernandez's avatar David Fernandez :two:
Browse files

Merge branch '427792-geo-bandaid-for-registry-rows-stuck-in-sync-state-queued' into 'master'

Geo: Avoid getting resources stuck in Queued

See merge request gitlab-org/gitlab!133782



Merged-by: David Fernandez's avatarDavid Fernandez <dfernandez@gitlab.com>
Approved-by: default avatarIan Baum <ibaum@gitlab.com>
Approved-by: David Fernandez's avatarDavid Fernandez <dfernandez@gitlab.com>
Co-authored-by: Michael Kozono's avatarMike Kozono <mkozono@gitlab.com>
parents e1d756db 31442fb7
No related branches found
No related tags found
1 merge request!133782Geo: Avoid getting resources stuck in Queued
Pipeline #1036080523 passed
......@@ -86,6 +86,7 @@ def replicator_class
before_transition any => :pending do |registry, _|
registry.retry_at = nil
registry.retry_count = 0
registry.last_synced_at = nil
end
before_transition any => :failed do |registry, _|
......
......@@ -112,15 +112,18 @@
end
context 'when a sync is currently running' do
let(:registry) { replicator.registry }
it 'moves registry state to pending' do
replicator.registry.start!
registry.start!
# sync no-op, as if the lease is already taken
allow(replicator).to receive(:sync_repository)
expect do
replicator.consume(::Geo::RepositoryReplicatorStrategy::EVENT_UPDATED)
end.to change { replicator.registry.reload.pending? }.from(false).to(true)
end.to change { registry.reload.pending? }.from(false).to(true)
.and change { registry.reload.last_synced_at }.to(nil)
end
end
end
......
......@@ -245,6 +245,13 @@
end.to change { registry.retry_at }.from(a_kind_of(ActiveSupport::TimeWithZone)).to(nil)
.and change { registry.retry_count }.to(0)
end
it 'sets last_synced_at to nil' do
expect do
registry.pending!
registry.reload
end.to change { registry.last_synced_at }.from(a_kind_of(ActiveSupport::TimeWithZone)).to(nil)
end
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment