Merge pull request #13656 from chanks/rollback_transactions_in_killed_threads

Data corruption risk: Roll back open transactions when the running thread is killed.

1 files changed, 11 insertions, 5 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..fd666c8c39 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -190,11 +190,17 @@ module ActiveRecord
         rollback_transaction if transaction
         raise
       ensure
-        begin
-          commit_transaction unless error
-        rescue Exception
-          transaction.rollback unless transaction.state.completed?
-          raise
+        unless error
+          if Thread.current.status == 'aborting'
+            rollback_transaction
+          else
+            begin
+              commit_transaction
+            rescue Exception
+              transaction.rollback unless transaction.state.completed?
+              raise
+            end
+          end
         end
       end