Remove extra decrement of transaction level #11434
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/cc @neerajdotname, @rafaelfranca, @jonleighton |
|
I used tests from #9828 but they need some cleanup to use old test models, instead of adding new one. |
| @@ -355,13 +356,14 @@ def remember_transaction_record_state #:nodoc: | |||
| def clear_transaction_record_state #:nodoc: | |||
| @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1 | |||
| @_start_transaction_state.clear if @_start_transaction_state[:level] < 1 | |||
|
|
|||
`rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
|
Updated PR with clean tests and fixes based on feedback. |
spastorino
added a commit
that referenced
this pull request
Jul 15, 2013
Remove extra decrement of transaction level
This was referenced Jul 15, 2013
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rollback_active_record_state!tries to restore model state onExceptionby invoking
restore_transaction_record_stateit decrement deep level by1.After restoring state,
rollback_active_record_state!ensure that states should be clearedand level decremented by invoking
clear_transaction_record_state,which cause the bug: because state already reduced in
restore_transaction_record_state.Removed double derement of transaction level
and removed duplicated code which clear transaction state for top level.
Closes: #4566