[Neo-report] r2811 jm - /trunk/neo/client/app.py

[nobody at svn.erp5.org]

Author: jm
Date: Wed Aug 31 11:36:53 2011
New Revision: 2811

Log:
client: disable deadlock avoidance code until it is fixed

A ConflictError is raised instead.

Modified:
    trunk/neo/client/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Wed Aug 31 11:36:53 2011
@@ -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
+                neo.lib.logging.info('Deadlock avoidance on %r:%r',
+                    dump(oid), dump(serial))
+              else:
                 # 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,