jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix deadlock during artist ban test.

Browse Source 
The artist ban tests deadlocked because of a weird interaction between
threads and database transactions when tagging posts in parallel. Add a
hack to work around it.
This commit is contained in:
evazion
2021-09-20 02:09:14 -05:00
parent 5995571885
commit 98b3c82ac5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/application_record.rb
View File

@@ -168,7 +168,7 @@ class ApplicationRecord < ActiveRecord::Base
concerning :ConcurrencyMethods do concerning :ConcurrencyMethods do
class_methods do class_methods do
def parallel_each(batch_size: 1000, in_processes: 4, in_threads: nil) def parallel_each(batch_size: 1000, in_processes: 4, in_threads: nil, &block)
# XXX Use threads in testing because processes can't see each other's # XXX Use threads in testing because processes can't see each other's
# database transactions. # database transactions.
if Rails.env.test? if Rails.env.test?
@@ -176,6 +176,9 @@ class ApplicationRecord < ActiveRecord::Base
in_threads = 2 in_threads = 2
end end
# XXX Threads deadlock during tests if a transaction is open; do a non-parallel each.
return find_each(&block) if Rails.env.test? && connection.transaction_open?
current_user = CurrentUser.user current_user = CurrentUser.user
current_ip = CurrentUser.ip_addr current_ip = CurrentUser.ip_addr