apply feedback

2 files changed, 13 insertions, 4 deletions

diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index bebaa3b807b..43c2b419332 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -9,7 +9,16 @@ module ObjectStorage
   RemoteStoreError = Class.new(StandardError)
   UnknownStoreError = Class.new(StandardError)
   ObjectStorageUnavailable = Class.new(StandardError)
-  ExclusiveLeaseTaken = Class.new(StandardError)
+
+  class ExclusiveLeaseTaken < StandardError
+    def initialize(lease_key)
+      @lease_key = lease_key
+    end
+
+    def message
+      "Exclusive lease #{@lease_key} already taken."
+    end
+  end
 
   TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
 
@@ -379,7 +388,7 @@ module ObjectStorage
     def with_exclusive_lease
       lease_key = exclusive_lease_key
       uuid = Gitlab::ExclusiveLease.new(lease_key, timeout: 1.hour.to_i).try_obtain
-      raise ExclusiveLeaseTaken, "Exclusive lease #{lease_key} already taken." unless uuid
+      raise ExclusiveLeaseTaken.new(lease_key) unless uuid
 
       yield uuid
     ensure
diff --git a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
index ba01cfe53c5..31d323626c5 100644
--- a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
+++ b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
@@ -129,7 +129,7 @@ describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
     describe "limits N+1 queries" do
       let!(:projects) { create_list(:project, 10, :with_avatar) }
 
-      it do
+      it "to N*#{MIGRATION_QUERIES}" do
         query_count = ActiveRecord::QueryRecorder.new { perform(uploads) }
 
         more_projects = create_list(:project, 100, :with_avatar)
@@ -158,7 +158,7 @@ describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
     describe "limits N+1 queries" do
       let!(:projects) { create_list(:project, 10) }
 
-      it do
+      it "to N*#{MIGRATION_QUERIES}" do
         query_count = ActiveRecord::QueryRecorder.new { perform(uploads) }
 
         more_projects = create_list(:project, 100)