Commit 76c85aa3 authored by Julien Muchembled's avatar Julien Muchembled

client: disable deadlock avoidance code until it is fixed

A ConflictError is raised instead.

git-svn-id: 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 6a686360
......@@ -581,6 +581,11 @@ class Application(object):
serial = object_serial_dict[oid]
data = data_dict[oid]
if ZERO_TID in conflict_serial_set:
if 1:
# XXX: disable deadlock avoidance code until it is fixed'Deadlock avoidance on %r:%r',
dump(oid), dump(serial))
# Storage refused us from taking object lock, to avoid a
# possible deadlock. TID is actually used for some kind of
# "locking priority": when a higher value has the lock,
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