Commit 54d692c5 authored by Julien Muchembled's avatar Julien Muchembled

client: drop monkey-patch that is not mandatory anymore for NEO

We think there's still a bug, in ZODB.Connection or ZPublisher/Publish,
but since commit c277ed20, NEO does not
require anymore that Storage.sync() is called in order to take into account
invalidations that have already been received since the last tpc_finish.

IOW, this is not the place for such fix because it's independant to NEO.
ERP5 already ships it for ZEO (patch disabled by default).
parent d9ab77b8
...@@ -53,43 +53,6 @@ if 1: ...@@ -53,43 +53,6 @@ if 1:
Connection.tpc_finish = tpc_finish Connection.tpc_finish = tpc_finish
###
try:
if Connection._nexedi_fix != 5:
raise Exception("A different ZODB fix is already applied")
except AttributeError:
Connection._nexedi_fix = 5
# Whenever an connection is opened (and there's usually an existing one
# in DB pool that can be reused) whereas the transaction is already
# started, we must make sure that proper storage setup is done by
# calling Connection.newTransaction.
# For example, there's no open transaction when a ZPublisher/Publish
# transaction begins.
def open(self, *args, **kw):
def _flush_invalidations():
acquire = self._db._a
try:
self._db._r() # this is a RLock
except RuntimeError:
acquire = lambda: None
try:
del self._flush_invalidations
self.newTransaction()
finally:
acquire()
self._flush_invalidations = _flush_invalidations
self._flush_invalidations = _flush_invalidations
try:
Connection_open(self, *args, **kw)
finally:
del self._flush_invalidations
Connection_open = Connection.open
Connection.open = open
# IStorage implementations usually need to provide a "network barrier", # IStorage implementations usually need to provide a "network barrier",
# at least for NEO & ZEO, to make sure we have an up-to-date view of # at least for NEO & ZEO, to make sure we have an up-to-date view of
# the storage. It's unclear whether sync() is a good place to do this # the storage. It's unclear whether sync() is a good place to do this
......
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