Commit 41c30414 authored by Vincent Pelletier's avatar Vincent Pelletier

Do not return anything, tpc_vote does it for us.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2508 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 29a9e80b
...@@ -926,7 +926,6 @@ class Application(object): ...@@ -926,7 +926,6 @@ class Application(object):
else: else:
raise NEOStorageError('undo failed') raise NEOStorageError('undo failed')
tid = self.local_var.tid
oid_list = self.local_var.txn_info['oids'] oid_list = self.local_var.txn_info['oids']
# Regroup objects per partition, to ask a minimum set of storage. # Regroup objects per partition, to ask a minimum set of storage.
...@@ -951,8 +950,8 @@ class Application(object): ...@@ -951,8 +950,8 @@ class Application(object):
shuffle(cell_list) shuffle(cell_list)
cell_list.sort(key=getCellSortKey) cell_list.sort(key=getCellSortKey)
storage_conn = getConnForCell(cell_list[0]) storage_conn = getConnForCell(cell_list[0])
storage_conn.ask(Packets.AskObjectUndoSerial(tid, undone_tid, storage_conn.ask(Packets.AskObjectUndoSerial(self.local_var.tid,
oid_list), queue=queue) undone_tid, oid_list), queue=queue)
# Wait for all AnswerObjectUndoSerial. We might get OidNotFoundError, # Wait for all AnswerObjectUndoSerial. We might get OidNotFoundError,
# meaning that objects in transaction's oid_list do not exist any # meaning that objects in transaction's oid_list do not exist any
...@@ -996,7 +995,6 @@ class Application(object): ...@@ -996,7 +995,6 @@ class Application(object):
'transaction', oid) 'transaction', oid)
undo_serial = None undo_serial = None
self._store(oid, current_serial, data, undo_serial) self._store(oid, current_serial, data, undo_serial)
return tid, oid_list
def _insertMetadata(self, txn_info, extension): def _insertMetadata(self, txn_info, extension):
for k, v in loads(extension).items(): for k, v in loads(extension).items():
......
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