Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions app/services/sync_pending_registry_changesets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,24 @@ def deliver_changeset(actions)

def deliver_changeset_to_endpoint(body, key)
attempt = 0
max_attempts = changeset_endpoint_attempts

begin
attempt += 1
post_changeset_zip(body, key)
rescue StandardError => e
if attempt < ENDPOINT_DELIVERY_ATTEMPTS
if attempt < max_attempts
MR.logger.warn(
"Registry changeset endpoint delivery attempt #{attempt} of " \
"#{ENDPOINT_DELIVERY_ATTEMPTS} failed for #{key}: #{e.class}: #{e.message}"
"#{max_attempts} failed for #{key}: #{e.class}: #{e.message}"
)
sleep(changeset_endpoint_retry_interval)
retry
end

MR.logger.error(
"Registry changeset endpoint delivery failed for #{key} after " \
"#{ENDPOINT_DELIVERY_ATTEMPTS} attempts: #{e.class}: #{e.message}"
"#{max_attempts} attempts: #{e.class}: #{e.message}"
)
Airbrake.notify(e) if defined?(Airbrake)
end
Expand Down Expand Up @@ -227,6 +228,15 @@ def changeset_endpoint_retry_interval
[(ENV['REGISTRY_CHANGESET_SYNC_ENDPOINT_RETRY_INTERVAL_SECONDS'].presence || '30').to_i, 0].max
end

# Total number of delivery attempts (not retries). Set to 1 to disable retries
# entirely — the endpoint is POSTed exactly once. Defaults to ENDPOINT_DELIVERY_ATTEMPTS.
def changeset_endpoint_attempts
[
(ENV['REGISTRY_CHANGESET_SYNC_ENDPOINT_ATTEMPTS'].presence || ENDPOINT_DELIVERY_ATTEMPTS).to_i,
1
].max
end

def changeset_zip(actions)
Zip::OutputStream.write_buffer do |zip|
ENTITY_TYPES.each do |entity_type|
Expand Down
Loading