Commit d902ebc2 authored by Aurel's avatar Aurel

add comment on part which can lead to issues

when aborting a transaction, delete it from transaction dict


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@243 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 4c26ecf8
...@@ -178,7 +178,7 @@ class ServiceEventHandler(MasterEventHandler): ...@@ -178,7 +178,7 @@ class ServiceEventHandler(MasterEventHandler):
# Otherwise, I know it only by the server address or the same # Otherwise, I know it only by the server address or the same
# server address but with a different UUID. # server address but with a different UUID.
if node.getUUID() is None: if node.getUUID() is None:
# This must be a master node. # This must be a master node. XXX Why ??
if not isinstance(node, MasterNode) \ if not isinstance(node, MasterNode) \
or node_type != MASTER_NODE_TYPE: or node_type != MASTER_NODE_TYPE:
# Error. This node uses the same server address as # Error. This node uses the same server address as
...@@ -403,6 +403,8 @@ class ServiceEventHandler(MasterEventHandler): ...@@ -403,6 +403,8 @@ class ServiceEventHandler(MasterEventHandler):
if state == RUNNING_STATE: if state == RUNNING_STATE:
# No problem. # No problem.
# XXX means that if a node is known as broken and is notified as
# running, it will not be taken into account, is it OK ?
continue continue
# Something wrong happened possibly. Cut the connection to # Something wrong happened possibly. Cut the connection to
...@@ -452,7 +454,6 @@ class ServiceEventHandler(MasterEventHandler): ...@@ -452,7 +454,6 @@ class ServiceEventHandler(MasterEventHandler):
if not isinstance(node, ClientNode): if not isinstance(node, ClientNode):
self.handleUnexpectedPacket(conn, packet) self.handleUnexpectedPacket(conn, packet)
return return
tid = app.getNextTID() tid = app.getNextTID()
app.finishing_transaction_dict[tid] = FinishingTransaction(conn) app.finishing_transaction_dict[tid] = FinishingTransaction(conn)
conn.addPacket(Packet().answerNewTID(packet.getId(), tid)) conn.addPacket(Packet().answerNewTID(packet.getId(), tid))
...@@ -584,7 +585,7 @@ class ServiceEventHandler(MasterEventHandler): ...@@ -584,7 +585,7 @@ class ServiceEventHandler(MasterEventHandler):
return return
try: try:
app.finishing_transaction_dict[tid] del app.finishing_transaction_dict[tid]
except KeyError: except KeyError:
logging.warn('aborting transaction %s does not exist', dump(tid)) logging.warn('aborting transaction %s does not exist', dump(tid))
pass pass
......
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