tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Lock table on transaction start

Browse Source 
When trying to lock a table, we check if it was locked at the start of the
transaction otherwise we raise a TransactionError so the all transaction is
restarted over with the table added to the table to lock.
This ensures when a table is locked that we always read the last committed
values.

Closes #10870
This commit is contained in:
Cédric Krier
2022-12-26 15:05:56 +01:00
parent 63400adeb3
commit dd222215eb
12 changed files with 196 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proteus/proteus/config.py
+30 -18
View File
@@ -183,7 +183,7 @@ class _TrytondMethod(object):
def __call__(self, *args, **kwargs):
from trytond.rpc import RPC
from trytond.tools import is_instance_method
from trytond.transaction import Transaction
from trytond.transaction import Transaction, TransactionError
from trytond.worker import run_task
if self._name in self._object.__rpc__:
@@ -193,23 +193,35 @@ class _TrytondMethod(object):
else:
raise TypeError('%s is not callable' % self._name)
with Transaction().start(self._config.database_name,
self._config.user, readonly=rpc.readonly) as transaction:
args, kwargs, transaction.context, transaction.timestamp = \
rpc.convert(self._object, *args, **kwargs)
meth = getattr(self._object, self._name)
if (rpc.instantiate is None
or not is_instance_method(self._object, self._name)):
result = rpc.result(meth(*args, **kwargs))
else:
assert rpc.instantiate == 0
inst = args.pop(0)
if hasattr(inst, self._name):
result = rpc.result(meth(inst, *args, **kwargs))
else:
result = [rpc.result(meth(i, *args, **kwargs))
for i in inst]
transaction.commit()
extras = {}
while True:
with Transaction().start(self._config.database_name,
self._config.user, readonly=rpc.readonly,
**extras) as transaction:
try:
(c_args, c_kwargs,
transaction.context, transaction.timestamp) \
= rpc.convert(self._object, *args, **kwargs)
meth = getattr(self._object, self._name)
if (rpc.instantiate is None
or not is_instance_method(
self._object, self._name)):
result = rpc.result(meth(*c_args, **c_kwargs))
else:
assert rpc.instantiate == 0
inst = c_args.pop(0)
if hasattr(inst, self._name):
result = rpc.result(
meth(inst, *c_args, **c_kwargs))
else:
result = [rpc.result(meth(i, *c_args, **c_kwargs))
for i in inst]
except TransactionError as e:
transaction.rollback()
e.fix(extras)
continue
transaction.commit()
break
while transaction.tasks:
task_id = transaction.tasks.pop()
run_task(self._config.database_name, task_id)