diff --git a/lib/active_job/uniqueness/lock_manager.rb b/lib/active_job/uniqueness/lock_manager.rb index 96cc3dc..aaaaf7c 100644 --- a/lib/active_job/uniqueness/lock_manager.rb +++ b/lib/active_job/uniqueness/lock_manager.rb @@ -17,11 +17,17 @@ def delete_lock(resource) true end + DELETE_LOCKS_SCAN_COUNT = 1000 + # Unlocks multiple resources by key wildcard. def delete_locks(wildcard) @servers.each do |server| synced_redis_connection(server) do |conn| - conn.scan('MATCH', wildcard).each { |key| conn.call('DEL', key) } + cursor = 0 + while cursor != '0' + cursor, keys = conn.call('SCAN', cursor, 'MATCH', wildcard, 'COUNT', DELETE_LOCKS_SCAN_COUNT) + conn.call('DEL', *keys) unless keys.empty? + end end end diff --git a/spec/active_job/uniqueness/unlock_spec.rb b/spec/active_job/uniqueness/unlock_spec.rb index ec2f668..495142d 100644 --- a/spec/active_job/uniqueness/unlock_spec.rb +++ b/spec/active_job/uniqueness/unlock_spec.rb @@ -68,4 +68,26 @@ end end end + + describe 'bulk deletion' do + subject(:unlock!) { described_class.unlock! } + + let(:expected_initial_number_of_locks) { 1_103 } # 1_100 + 2 + 1 + let(:expected_number_of_delete_commands) { 2 } # 1103 / 1000 (ActiveJob::Uniqueness::LockManager::DELETE_LOCKS_SCAN_COUNT) + + before { 1_100.times.each { |i| job_class.perform_later(3, i) } } + + it 'removes locks efficiently' do + expect { unlock! }.to change { locks_count }.from(expected_initial_number_of_locks).to(0) + .and change { delete_commands_calls }.by(expected_number_of_delete_commands) + end + + def delete_commands_calls + info = redis.call('INFO', 'commandstats') + del_stats = info.split("\n").find { |line| line.start_with?('cmdstat_del:') } + return 0 unless del_stats + + del_stats.match(/cmdstat_del:calls=(\d+)/)[1].to_i + end + end end