Commit 5fc2331f authored by Jim Fulton's avatar Jim Fulton

The storage server failed to call tpc_vote on served storages.

parent 8e080ebb
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
# #
############################################################################## ##############################################################################
__version__ = "$Revision: 1.10 $"[11:-2] __version__ = "$Revision: 1.11 $"[11:-2]
import asyncore, socket, string, sys, cPickle, os import asyncore, socket, string, sys, cPickle, os
from smac import SizedMessageAsyncConnection from smac import SizedMessageAsyncConnection
...@@ -114,6 +114,7 @@ class StorageServer(asyncore.dispatcher): ...@@ -114,6 +114,7 @@ class StorageServer(asyncore.dispatcher):
def __init__(self, connection, storages): def __init__(self, connection, storages):
self.__storages=storages self.__storages=storages
for n, s in storages.items(): init_storage(s)
self.__connections={} self.__connections={}
self.__get_connections=self.__connections.get self.__get_connections=self.__connections.get
...@@ -362,7 +363,11 @@ class Connection(SizedMessageAsyncConnection): ...@@ -362,7 +363,11 @@ class Connection(SizedMessageAsyncConnection):
self.message_output('s'+dump((oid,newserial), 1)) self.message_output('s'+dump((oid,newserial), 1))
return _noreturn return _noreturn
def vote(self): pass def vote(self, id):
t=self._transaction
if t is None or id != t.id:
raise POSException.StorageTransactionError(self, id)
return self.__storage.tpc_vote(t)
def undo(self, transaction_id): def undo(self, transaction_id):
oids=self.__storage.undo(transaction_id) oids=self.__storage.undo(transaction_id)
...@@ -455,6 +460,8 @@ class Connection(SizedMessageAsyncConnection): ...@@ -455,6 +460,8 @@ class Connection(SizedMessageAsyncConnection):
self.__invalidated) self.__invalidated)
self.__invalidated=[] self.__invalidated=[]
def init_storage(storage):
if not hasattr(storage,'tpc_vote'): storage.tpc_vote=lambda *args: None
if __name__=='__main__': if __name__=='__main__':
import ZODB.FileStorage import ZODB.FileStorage
......
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