-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fix transaction finalizer causing LiteDB.LiteException/System.ObjectDisposedException #2721
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ejdre-vestas
wants to merge
2
commits into
litedb-org:dev
Choose a base branch
from
ejdre-vestas:bugfix/fix-finalize-causing-synchronization-lock-exception
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+41
−24
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| using System; | ||
| using System.Collections.Concurrent; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Runtime.InteropServices; | ||
| using System.Threading; | ||
| using static LiteDB.Constants; | ||
|
|
||
|
|
@@ -105,9 +103,10 @@ public TransactionService GetTransaction(bool create, bool queryOnly, out bool i | |
| } | ||
|
|
||
| /// <summary> | ||
| /// Release current thread transaction | ||
| /// Dispose and remove transaction from monitor | ||
| /// without releasing thread lock | ||
| /// </summary> | ||
| public void ReleaseTransaction(TransactionService transaction) | ||
| public bool RemoveTransaction(TransactionService transaction) | ||
| { | ||
| // dispose current transaction | ||
| transaction.Dispose(); | ||
|
|
@@ -123,8 +122,16 @@ public void ReleaseTransaction(TransactionService transaction) | |
| _freePages += transaction.MaxTransactionSize; | ||
|
|
||
| // check if current thread contains more query transactions | ||
| keepLocked = _transactions.Values.Any(x => x.ThreadID == Environment.CurrentManagedThreadId); | ||
| return keepLocked = _transactions.Values.Any(x => x.ThreadID == Environment.CurrentManagedThreadId); | ||
|
||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Release current thread transaction | ||
| /// </summary> | ||
| public void ReleaseTransaction(TransactionService transaction) | ||
| { | ||
| var keepLocked = RemoveTransaction(transaction); | ||
|
|
||
| // unlock thread-transaction only if there is no more transactions | ||
| if (keepLocked == false) | ||
|
|
@@ -150,7 +157,7 @@ public TransactionService GetThreadTransaction() | |
| { | ||
| lock (_transactions) | ||
| { | ||
| return | ||
| return | ||
| _slot.Value ?? | ||
| _transactions.Values.FirstOrDefault(x => x.ThreadID == Environment.CurrentManagedThreadId); | ||
| } | ||
|
|
@@ -191,7 +198,7 @@ private int GetInitialSize() | |
| /// </summary> | ||
| private bool TryExtend(TransactionService trans) | ||
| { | ||
| lock(_transactions) | ||
| lock (_transactions) | ||
| { | ||
| if (_freePages >= _initialSize) | ||
| { | ||
|
|
@@ -211,7 +218,7 @@ private bool TryExtend(TransactionService trans) | |
| /// </summary> | ||
| public bool CheckSafepoint(TransactionService trans) | ||
| { | ||
| return | ||
| return | ||
| trans.Pages.TransactionSize >= trans.MaxTransactionSize && | ||
| this.TryExtend(trans) == false; | ||
| } | ||
|
|
@@ -232,4 +239,4 @@ public void Dispose() | |
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling
transaction.Dispose()withinRemoveTransactioncreates infinite recursion. The finalizer callsDispose(false), which callsRemoveTransaction, which callsDispose()again. This will result in a stack overflow. TheRemoveTransactionmethod should not calltransaction.Dispose()since it's already being called from within the transaction's ownDispose(bool)method.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did not change this behavior, but I think this comment is wrong anyway.
Calling the
Disposehere will doThe
disposeboolean is true, and the finalizer will never be called because that is being suppressed.