diff options
author | Chris Hanks <christopher.m.hanks@gmail.com> | 2014-01-09 23:21:41 +0000 |
---|---|---|
committer | Chris Hanks <christopher.m.hanks@gmail.com> | 2014-08-22 10:58:04 -0400 |
commit | 997a62198c70c85f229bb05a4c1b63f496531cbd (patch) | |
tree | a1b44fd4577bfbb00658f25afd112bb102d67010 /activerecord | |
parent | 5d7c1057684c377bc2801c8851e99ff11ab23530 (diff) | |
download | rails-997a62198c70c85f229bb05a4c1b63f496531cbd.tar.gz rails-997a62198c70c85f229bb05a4c1b63f496531cbd.tar.bz2 rails-997a62198c70c85f229bb05a4c1b63f496531cbd.zip |
Roll back open transactions when the running thread is killed.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 6 | ||||
-rw-r--r-- | activerecord/test/cases/transactions_test.rb | 31 |
2 files changed, 36 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 90be835d8a..08b219cdd8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -191,7 +191,11 @@ module ActiveRecord raise ensure begin - commit_transaction unless error + if Thread.current.status == 'aborting' + rollback_transaction + elsif !error + commit_transaction + end rescue Exception transaction.rollback unless transaction.state.completed? raise diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 9cfe041de2..5cccf2dda5 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -492,6 +492,37 @@ class TransactionTest < ActiveRecord::TestCase assert topic.frozen?, 'not frozen' end + # The behavior of killed threads having a status of "aborting" was changed + # in Ruby 2.0, so Thread#kill on 1.9 will prematurely commit the transaction + # and there's nothing we can do about it. + unless RUBY_VERSION.start_with? '1.9' + def test_rollback_when_thread_killed + queue = Queue.new + thread = Thread.new do + Topic.transaction do + @first.approved = true + @second.approved = false + @first.save + + queue.push nil + sleep + + @second.save + end + end + + queue.pop + thread.kill + thread.join + + assert @first.approved?, "First should still be changed in the objects" + assert !@second.approved?, "Second should still be changed in the objects" + + assert !Topic.find(1).approved?, "First shouldn't have been approved" + assert Topic.find(2).approved?, "Second should still be approved" + end + end + def test_restore_active_record_state_for_all_records_in_a_transaction topic_without_callbacks = Class.new(ActiveRecord::Base) do self.table_name = 'topics' |