2 files changed, 27 insertions, 0 deletions
diff --git a/app/workers/concerns/object_storage_queue.rb b/app/workers/concerns/object_storage_queue.rb
new file mode 100644
index 00000000000..a80f473a6d4
--- /dev/null
+++ b/app/workers/concerns/object_storage_queue.rb
@@ -0,0 +1,8 @@
+# Concern for setting Sidekiq settings for the various GitLab ObjectStorage workers.
+module ObjectStorageQueue
+  extend ActiveSupport::Concern
+
+  included do
+    queue_namespace :object_storage
+  end
+end
diff --git a/spec/workers/concerns/object_storage_queue_spec.rb b/spec/workers/concerns/object_storage_queue_spec.rb
new file mode 100644
index 00000000000..f725fc9a4b1
--- /dev/null
+++ b/spec/workers/concerns/object_storage_queue_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ObjectStorageQueue do
+  let(:worker) do
+    Class.new do
+      def self.name
+        'DummyWorker'
+      end
+
+      include ApplicationWorker
+      include ObjectStorageQueue
+    end
+  end
+
+  it 'sets a default object storage queue automatically' do
+    expect(worker.sidekiq_options['queue'])
+      .to eq 'object_storage:dummy'
+  end
+end