GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit af41bd41 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Fix off-by-one error in background migration retries

parent 7b146ab6
......@@ -48,12 +48,17 @@ def self.steal(steal_class)
#
# arguments - The arguments to pass to the background migration's "perform"
# method.
def self.perform(class_name, arguments, retries: 1)
def self.perform(class_name, arguments, retries: 0)
const_get(class_name).new.perform(*arguments)
rescue => e
Rails.logger.warn("Retrying background migration #{class_name} " \
"with #{arguments}")
(retries -= 1) > 0 ? retry : raise
rescue StandardError
if retries > 0
Rails.logger.warn("Retrying background migration #{class_name} " \
"with #{arguments}")
retries -= 1
retry
else
raise
end
end
end
end
......@@ -63,14 +63,10 @@
end
context 'when standard error is being raised' do
before do
allow(migration).to receive(:perform).with(10, 20)
.and_raise(StandardError, 'Migration error')
end
it 'recovers from an exception and retries the migration' do
expect(migration).to receive(:perform).with(10, 20)
.exactly(3).times.ordered
.and_raise(StandardError, 'Migration error')
.exactly(4).times.ordered
expect(migration).to receive(:perform).with(20, 30)
.once.ordered
expect(Rails.logger).to receive(:warn)
......@@ -148,7 +144,17 @@
expect(migration).to receive(:perform).with(10, 20)
.and_raise(StandardError).once
expect { described_class.perform('Foo', [10, 20], retries: 0) }
expect { described_class.perform('Foo', [10, 20], retries: 0) }
.to raise_error(StandardError)
end
end
context 'when retries count is one' do
it 'retries a background migration when needed' do
expect(migration).to receive(:perform).with(10, 20)
.and_raise(StandardError).twice
expect { described_class.perform('Foo', [10, 20], retries: 1) }
.to raise_error(StandardError)
end
end
......@@ -156,9 +162,9 @@
context 'when retries count is larger than zero' do
it 'retries a background migration when needed' do
expect(migration).to receive(:perform).with(10, 20)
.and_raise(StandardError).exactly(3).times
.and_raise(StandardError).exactly(4).times
expect { described_class.perform('Foo', [10, 20], retries: 3) }
expect { described_class.perform('Foo', [10, 20], retries: 3) }
.to raise_error(StandardError)
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment