shave off another 20% query

3 files changed, 6 insertions, 6 deletions

diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index 3f5d0d200f4..bc8f1a5861a 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -376,12 +376,13 @@ module ObjectStorage
     end
 
     def with_exclusive_lease
-      uuid = Gitlab::ExclusiveLease.new(exclusive_lease_key, timeout: 1.hour.to_i).try_obtain
-      raise 'exclusive lease already taken' unless uuid
+      lease_key = exclusive_lease_key
+      uuid = Gitlab::ExclusiveLease.new(lease_key, timeout: 1.hour.to_i).try_obtain
+      raise "Exclusive lease #{lease_key} already taken." unless uuid
 
       yield uuid
     ensure
-      Gitlab::ExclusiveLease.cancel(exclusive_lease_key, uuid)
+      Gitlab::ExclusiveLease.cancel(lease_key, uuid)
     end
 
     #
diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb
index 89c74a78835..301f4681fcd 100644
--- a/app/uploaders/records_uploads.rb
+++ b/app/uploaders/records_uploads.rb
@@ -22,7 +22,7 @@ module RecordsUploads
 
       Upload.transaction do
         uploads.where(path: upload_path).delete_all
-        upload.destroy! if upload
+        upload.delete if upload
 
         self.upload = build_upload.tap(&:save!)
       end
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 18da0c6d39a..ba01cfe53c5 100644
--- a/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
+++ b/spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-MIGRATION_QUERIES = 7
+MIGRATION_QUERIES = 5
 
 describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
   shared_context 'sanity_check! fails' do
@@ -14,7 +14,6 @@ describe ObjectStorage::MigrateUploadsWorker, :sidekiq do
   let(:to_store) { ObjectStorage::Store::REMOTE }
 
   def perform(uploads)
-    binding.pry
     described_class.new.perform(uploads.ids, model_class.to_s, mounted_as, to_store)
   rescue ObjectStorage::MigrateUploadsWorker::Report::MigrationFailures
     # swallow