Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HOLD] Rename queues to include replication_ and audit_ in the name #2185

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion app/jobs/audit/catalog_to_moab_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Audit
# Check filesystem based on catalog, updating database
# @see Audit::CatalogToMoab
class CatalogToMoabJob < ApplicationJob
queue_as :c2m
queue_as :audit_catalog_to_moab

before_enqueue do |job|
raise ArgumentError, 'MoabRecord param required' unless job.arguments.first.is_a?(MoabRecord)
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/audit/checksum_validation_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Audit
# Confirm checksum for one Moab on storage and update MoabRecord in database
# @see Audit::ChecksumValidator
class ChecksumValidationJob < ApplicationJob
queue_as :checksum_validation
queue_as :audit_checksum_validation

before_enqueue do |job|
raise ArgumentError, 'MoabRecord param required' unless job.arguments.first.is_a?(MoabRecord)
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/audit/moab_to_catalog_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Audit
# Check catalog based on filesystem, updating database
# @see MoabRecordService::CheckExistence
class MoabToCatalogJob < ApplicationJob
queue_as :m2c
queue_as :audit_moab_to_catalog

before_enqueue do |job|
raise ArgumentError, 'MoabStorageRoot param required' unless job.arguments.first.is_a?(MoabStorageRoot)
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/delivery_dispatcher_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module Replication
# the VM is updated to a new vesrion). Therefore, we receive the zip
# metadata from the process that actually created the zip file.
class DeliveryDispatcherJob < Replication::ZipPartJobBase
queue_as :zips_made
queue_as :replication_delivery_dispatcher

before_enqueue do |job|
job.zip_info_check!(job.arguments.fourth)
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/ibm_south_delivery_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Replication
# @note this class name appears in config files for the endpoints for which it delivers content.
# Please update the configs for the various environments if it's renamed or moved.
class IbmSouthDeliveryJob < Replication::DeliveryJobBase
queue_as :ibm_us_south_delivery
queue_as :replication_ibm_us_south_delivery

# perform method is defined in DeliveryJobBase

Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/results_recorder_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Replication
# 2. when all zip parts for the druid version are delivered to ONE endpoint,
# Report to DOR event service
class ResultsRecorderJob < ApplicationJob
queue_as :zip_endpoint_events
queue_as :replication_results_recorder

include UniqueJob

Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/s3_east_delivery_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Replication
# Please update the configs for the various environments if it's renamed or moved.
# @note This name is slightly misleading, as this class solely deals with AWS US East 1 endpoint
class S3EastDeliveryJob < Replication::DeliveryJobBase
queue_as :s3_us_east_1_delivery
queue_as :replication_s3_east_delivery

# perform method is defined in DeliveryJobBase

Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/s3_west_delivery_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Replication
# Please update the configs for the various environments if it's renamed or moved.
# @note This name is slightly misleading, as this class solely deals with AWS US West 2 endpoint
class S3WestDeliveryJob < Replication::DeliveryJobBase
queue_as :s3_us_west_2_delivery
queue_as :replication_s3_west_delivery

# perform method is defined in DeliveryJobBase

Expand Down
2 changes: 1 addition & 1 deletion app/jobs/replication/zipmaker_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Replication
# Note: a single DruidVersionZip may have more than one ZipPart.
# 2. Invoke Replication::DeliveryDispatcherJob for each ZipPart.
class ZipmakerJob < ApplicationJob
queue_as :zipmaker
queue_as :replication_zipmaker
delegate :find_or_create_zip!, :file_path, :part_keys, to: :zip

attr_accessor :zip
Expand Down
2 changes: 1 addition & 1 deletion spec/jobs/replication/ibm_south_delivery_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
end

it 'uses its own queue' do
expect(described_class.new.queue_name).to eq 'ibm_us_south_delivery'
expect(described_class.new.queue_name).to eq 'replication_ibm_us_south_delivery'
end
end
2 changes: 1 addition & 1 deletion spec/jobs/replication/s3_east_delivery_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
end

it 'uses its own queue' do
expect(described_class.new.queue_name).to eq 's3_us_east_1_delivery'
expect(described_class.new.queue_name).to eq 'replication_s3_east_delivery'
end
end
2 changes: 1 addition & 1 deletion spec/jobs/replication/s3_west_delivery_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
end

it 'uses its own queue' do
expect(described_class.new.queue_name).to eq 's3_us_west_2_delivery'
expect(described_class.new.queue_name).to eq 'replication_s3_west_delivery'
end
end