Commit 64824ad7 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Keep transactions that are being committed when a client gets disconnected.

Signed-off-by: default avatarGrégory <gregory@nexedi.com>

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2645 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent bd2273ce
...@@ -105,6 +105,7 @@ class Transaction(object): ...@@ -105,6 +105,7 @@ class Transaction(object):
self._uuid_set = set(uuid_list) self._uuid_set = set(uuid_list)
self._lock_wait_uuid_set = set(uuid_list) self._lock_wait_uuid_set = set(uuid_list)
self._birth = time() self._birth = time()
self._prepared = False
def __repr__(self): def __repr__(self):
return "<%s(client=%r, tid=%r, oids=%r, storages=%r, age=%.2fs) at %x>" % ( return "<%s(client=%r, tid=%r, oids=%r, storages=%r, age=%.2fs) at %x>" % (
...@@ -154,6 +155,21 @@ class Transaction(object): ...@@ -154,6 +155,21 @@ class Transaction(object):
return list(self._oid_list) return list(self._oid_list)
def isPrepared(self):
"""
Returns True if the commit has been requested by the client
"""
return self._prepared
def prepare(self, tid, oid_list, uuid_list, msg_id):
self._tid = tid
self._oid_list = oid_list
self._msg_id = msg_id
self._uuid_set = set(uuid_list)
self._lock_wait_uuid_set = set(uuid_list)
self._prepared = True
def forget(self, uuid): def forget(self, uuid):
""" """
Given storage was lost while waiting for its lock, stop waiting Given storage was lost while waiting for its lock, stop waiting
...@@ -429,6 +445,7 @@ class TransactionManager(object): ...@@ -429,6 +445,7 @@ class TransactionManager(object):
# remove transactions # remove transactions
remove = self.remove remove = self.remove
for ttid in self._node_dict[node].keys(): for ttid in self._node_dict[node].keys():
if not self._ttid_dict[ttid].isPrepared():
remove(uuid, ttid) remove(uuid, ttid)
# discard node entry # discard node entry
del self._node_dict[node] del self._node_dict[node]
......
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