#428

backend/spec/services/shared_resource_id_allocator_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe SharedResourceIdAllocator, 'lock lifecycle' do
   let(:record) { build(:external_tag) }
   let(:connection) { double('connection') }
   let(:transaction) { double('transaction', open?: true) }
-  let(:callbacks) { { } }
+  let(:callbacks) { [] }
   let(:sql) { [] }
 
   before do
@@ -128,19 +128,24 @@ RSpec.describe SharedResourceIdAllocator, 'lock lifecycle' do
       end
     end
     allow(ExternalTag).to receive(:connection).and_return(connection)
-    allow(ExternalTag).to receive(:current_transaction).and_return(transaction)
+    allow(connection).to receive(:current_transaction).and_return(transaction)
+    allow(connection).to receive(:add_transaction_record) { callbacks << _1 }
+    allow(connection).to receive(:disconnect!)
     allow(ExternalTag).to receive(:uncached).and_yield
-    [:after_commit, :after_rollback].each do |event|
-      allow(transaction).to receive(event) { |&callback| callbacks[event] = callback }
-    end
   end
 
-  [:after_commit, :after_rollback].each do |event|
+  def finish_transaction event
+    allow(transaction).to receive(:open?).and_return(false)
+    callbacks.shift.public_send(event)
+    allow(transaction).to receive(:open?).and_return(true)
+  end
+
+  [:committed!, :rolledback!].each do |event|
     it "holds the shared lock until #{ event }" do
       described_class.assign!(record)
       expect(record.id).to eq(9)
       expect(sql.grep(/RELEASE_LOCK/)).to be_empty
-      callbacks.fetch(event).call
+      finish_transaction(event)
       expect(sql.grep(/RELEASE_LOCK/).size).to eq(1)
     end
   end
@@ -155,7 +160,7 @@ RSpec.describe SharedResourceIdAllocator, 'lock lifecycle' do
   it 'releases a successfully acquired lock when allocation fails and rolls back' do
     allow(connection).to receive(:select_all).and_raise('query failed')
     expect { described_class.assign!(record) }.to raise_error(RuntimeError, 'query failed')
-    callbacks.fetch(:after_rollback).call
+    finish_transaction(:rolledback!)
     expect(sql.grep(/RELEASE_LOCK/).size).to eq(1)
   end
 
@@ -164,18 +169,17 @@ RSpec.describe SharedResourceIdAllocator, 'lock lifecycle' do
     described_class.assign!(record)
     expect(record.id).to eq(50)
     expect(sql.grep(/FOR UPDATE/)).to be_empty
-    callbacks.fetch(:after_commit).call
+    finish_transaction(:committed!)
   end
 
   it 'uses the same named lock within each space and different locks between spaces' do
     locks = [Tag, ExternalTag, TagDescription, TagGroup, TagDescriptionVersion, TagGroupVersion].map do |model|
       allow(model).to receive(:connection).and_return(connection)
-      allow(model).to receive(:current_transaction).and_return(transaction)
       allow(model).to receive(:uncached).and_yield
       record = model.new(id: 50)
       described_class.assign!(record)
       statement = sql.grep(/GET_LOCK/).last
-      callbacks.fetch(:after_commit).call
+      finish_transaction(:committed!)
       statement
     end
     expect(locks[0]).to eq(locks[1])
@@ -187,7 +191,21 @@ RSpec.describe SharedResourceIdAllocator, 'lock lifecycle' do
   it 'reports lock release failures' do
     described_class.assign!(record)
     allow(connection).to receive(:select_value).with(/RELEASE_LOCK/).and_return(nil)
-    expect { callbacks.fetch(:after_commit).call }
+    expect { finish_transaction(:committed!) }
         .to raise_error(ActiveRecord::ActiveRecordError, /lock release failed/)
+    expect(connection).to have_received(:disconnect!)
+  end
+
+  it 'keeps the lock and transfers cleanup when a savepoint rolls back' do
+    described_class.assign!(record)
+    callbacks.shift.rolledback!
+
+    expect(callbacks.size).to eq(1)
+    expect(sql.grep(/RELEASE_LOCK/)).to be_empty
+    described_class.assign!(record)
+    expect(sql.grep(/GET_LOCK/).size).to eq(1)
+
+    finish_transaction(:committed!)
+    expect(sql.grep(/RELEASE_LOCK/).size).to eq(1)
   end
 end