Skip to content

Add abort() related statuses to Transaction. #64

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.

Sign up for GitHub

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
jenstroeger wants to merge 6 commits into
base: master
Choose a base branch
from
+12 −3
Open

Add abort() related statuses to Transaction. #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c3a2a0
Add abort() related statuses to Transaction.
jenstroeger Sep 22, 2018
347830c
Fix test regression.
jenstroeger Sep 22, 2018
c99f24d
Allow to abort() a failed transaction.
jenstroeger Sep 23, 2018
8645992
Manage transaction status when aborting
jenstroeger Apr 6, 2022
ea21c00
Fix lint
jenstroeger Apr 6, 2022
2e85e93
Merge branch 'master' into issues/issue63
Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/transaction/_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,16 @@ class Status(object):
COMMITTING = "Committing"
COMMITTED = "Committed"

ABORTING = "Aborting"
ABORTED = "Aborted"

DOOMED = "Doomed"

# commit() or commit(True) raised an exception. All further attempts
# to commit or join this transaction will raise TransactionFailedError.
# commit() or commit(True) or abort() raised an exception. All further
# attempts to commit or join this transaction will raise
# TransactionFailedError.
COMMITFAILED = "Commit failed"
ABORTFAILED = "Abort failed"


class _NoSynchronizers(object):
Expand Down Expand Up @@ -542,6 +547,7 @@ def abort(self):

try:
self._synchronizers.map(lambda s: s.beforeCompletion(self))
self.status = Status.ABORTING
Copy link
Copy Markdown
Author

@jenstroeger jenstroeger Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably move that down to line 555, right before the for rm in self._resources loop which iterates and aborts.

except: # noqa: E722 do not use bare 'except'
t, v, tb = sys.exc_info()
self.log.error(
Expand All @@ -551,10 +557,13 @@ def abort(self):
try:
rm.abort(self)
except: # noqa: E722 do not use bare 'except'
self.status = Status.ABORTFAILED
if tb is None:
t, v, tb = sys.exc_info()
self.log.error("Failed to abort resource manager: %s",
rm, exc_info=sys.exc_info())
if self.status != Status.ABORTFAILED:
self.status = Status.ABORTED

self._callAfterAbortHooks()
# Unlike in commit(), we are no longer the current transaction
Expand Down
2 changes: 1 addition & 1 deletion src/transaction/tests/test__transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ def free(self, txn):
logger._clear()
mgr = txn._manager = _Mgr(txn)
txn.abort()
self.assertEqual(txn.status, Status.ACTIVE)
self.assertEqual(txn.status, Status.ABORTED)
self.assertTrue(mgr._txn is None)
self.assertEqual(logger._log[0][0], 'debug')
self.assertEqual(logger._log[0][1], 'abort')
Expand Down