Skip to content

G
gitlab-ce
Commit 5fd14297 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files
Options

Merge branch 'mk/remove-unused-code' into 'master' 

Geo: Remove unused BlobVerificationSecondaryService

See merge request gitlab-org/gitlab!52455
parents c4678144 47e62276
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 223 deletions
ee/app/services/geo/blob_verification_secondary_service.rb deleted 100644 → 0
View file @ c4678144
# frozen_string_literal: true
module Geo
class BlobVerificationSecondaryService
include Delay
include Gitlab::Geo::LogHelpers
def initialize(replicator)
@replicator = replicator
@registry = replicator.registry
end
def execute
return unless Gitlab::Geo.geo_database_configured?
return unless Gitlab::Geo.secondary?
return unless should_verify_checksum?
verify_checksum
end
private
attr_reader :replicator, :registry
delegate :model_record, :primary_checksum, :secondary_checksum, to: :replicator
def should_verify_checksum?
return false unless registry.synced?
return false unless primary_checksum.present?
mismatch?(secondary_checksum)
end
def mismatch?(checksum)
primary_checksum != checksum
end
def verify_checksum
checksum = model_record.calculate_checksum
if mismatch?(checksum)
update_registry!(mismatch: checksum, failure: 'checksum mismatch')
else
update_registry!(checksum: checksum)
end
rescue => e
update_registry!(failure: 'Error calculating checksum', exception: e)
end
def update_registry!(checksum: nil, mismatch: nil, failure: nil, exception: nil)
reverify, verification_retry_count =
if mismatch || failure.present?
log_error(failure, exception)
[true, registry.verification_retry_count.to_i + 1]
else
[false, nil]
end
resync_retry_at, resync_retry_count =
if reverify
[*calculate_next_retry_attempt]
end
registry.update!(
verification_checksum: checksum,
verification_checksum_mismatched: mismatch,
checksum_mismatch: mismatch.present?,
verified_at: Time.current,
verification_failure: failure,
verification_retry_count: verification_retry_count,
retry_at: resync_retry_at,
retry_count: resync_retry_count
)
end
def calculate_next_retry_attempt
retry_count = registry.retry_count.to_i + 1
[next_retry_time(retry_count), retry_count]
end
end
end
ee/spec/services/geo/blob_verification_secondary_service_spec.rb deleted 100644 → 0
View file @ c4678144
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Geo::BlobVerificationSecondaryService, :geo do
include ::EE::GeoHelpers
let(:secondary) { create(:geo_node) }
before do
stub_current_geo_node(secondary)
end
describe '#execute' do
let_it_be(:package_file) { create(:conan_package_file, :conan_recipe_file, verification_checksum: '62fc1ec4ce60') }
let!(:registry) { create(:geo_package_file_registry, :synced, package_file: package_file) }
subject(:service) { described_class.new(package_file.replicator) }
it 'does not calculate the checksum when not running on a secondary' do
stub_primary_node
expect(package_file).not_to receive(:calculate_checksum)
service.execute
end
it 'does not verify the checksum if resync is needed' do
registry.resync
expect(package_file).not_to receive(:calculate_checksum)
service.execute
end
it 'does not verify the checksum if sync is started' do
registry.start!
expect(package_file).not_to receive(:calculate_checksum)
service.execute
end
it 'does not verify the checksum if primary was never verified' do
package_file.assign_attributes(verification_checksum: nil)
expect(package_file).not_to receive(:calculate_checksum)
service.execute
end
it 'does not verify the checksum if the current checksum matches' do
package_file.assign_attributes(verification_checksum: '62fc1ec4ce60')
registry.update(verification_checksum: '62fc1ec4ce60')
expect(package_file).not_to receive(:calculate_checksum)
service.execute
end
it 'sets checksum when the checksum matches' do
allow(package_file).to receive(:calculate_checksum).and_return('62fc1ec4ce60')
service.execute
expect(registry.reload).to have_attributes(
verification_checksum: '62fc1ec4ce60',
checksum_mismatch: false,
verified_at: be_within(1.minute).of(Time.current),
verification_failure: nil,
verification_retry_count: nil,
retry_at: nil,
retry_count: nil
)
end
context 'when the checksum mismatch' do
before do
allow(package_file).to receive(:calculate_checksum).and_return('99fc1ec4ce60')
end
it 'keeps track of failures' do
service.execute
expect(registry.reload).to have_attributes(
verification_checksum: nil,
verification_checksum_mismatched: '99fc1ec4ce60',
checksum_mismatch: true,
verified_at: be_within(1.minute).of(Time.current),
verification_failure: 'checksum mismatch',
verification_retry_count: 1,
retry_at: be_present,
retry_count: 1
)
end
it 'ensures the next retry time is capped properly' do
registry.update(retry_count: 30)
service.execute
expect(registry.reload).to have_attributes(
retry_at: be_within(100.seconds).of(1.hour.from_now),
retry_count: 31
)
end
end
context 'when checksum calculation fails' do
before do
allow(package_file).to receive(:calculate_checksum).and_raise('Error calculating checksum')
end
it 'keeps track of failures' do
service.execute
expect(registry.reload).to have_attributes(
verification_checksum: nil,
verification_checksum_mismatched: nil,
checksum_mismatch: false,
verified_at: be_within(1.minute).of(Time.current),
verification_failure: 'Error calculating checksum',
verification_retry_count: 1,
retry_at: be_present,
retry_count: 1
)
end
it 'ensures the next retry time is capped properly' do
registry.update(retry_count: 30)
service.execute
expect(registry.reload).to have_attributes(
retry_at: be_within(100.seconds).of(1.hour.from_now),
retry_count: 31
)
end
end
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7