Commit 396f4796 authored by Grégory Wisniewski's avatar Grégory Wisniewski

All locks might not have been acquired when aborting.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2605 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 6529d231
...@@ -320,7 +320,12 @@ class TransactionManager(object): ...@@ -320,7 +320,12 @@ class TransactionManager(object):
assert lock_tid in (tid, None), 'Transaction %s tried to ' \ assert lock_tid in (tid, None), 'Transaction %s tried to ' \
'release the lock on oid %s, but it was held by %s' % ( 'release the lock on oid %s, but it was held by %s' % (
dump(tid), dump(oid), dump(lock_tid)) dump(tid), dump(oid), dump(lock_tid))
try:
del self._store_lock_dict[oid] del self._store_lock_dict[oid]
except KeyError:
# all locks might not have been acquiredwhen aborting
neo.logging.warning('%s write lock was not held by %s',
dump(oid), dump(tid))
# remove the transaction # remove the transaction
uuid = transaction.getUUID() uuid = transaction.getUUID()
self._uuid_dict[uuid].discard(transaction) self._uuid_dict[uuid].discard(transaction)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment