Commit c8c996cd authored by Grégory Wisniewski's avatar Grégory Wisniewski

Remove bad condition. The remote node type and state is implied by the current

handler. Process any notifyPartitionChange from the master node, even if it's
the same PTID (sent during replications).


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@913 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent f3d13236
...@@ -267,16 +267,11 @@ class MasterMonitoringEventHandler(MasterBaseEventHandler): ...@@ -267,16 +267,11 @@ class MasterMonitoringEventHandler(MasterBaseEventHandler):
app = self.app app = self.app
nm = app.nm nm = app.nm
pt = app.pt pt = app.pt
uuid = conn.getUUID() node = nm.getNodeByUUID(conn.getUUID())
node = app.nm.getNodeByUUID(uuid)
# This must be sent only by primary master node
if node.getNodeType() != MASTER_NODE_TYPE \
or app.primary_master_node is None \
or app.primary_master_node.getUUID() != uuid:
return
if app.ptid >= ptid: if ptid < app.ptid:
# Ignore this packet. # Ignore this packet.
# XXX: is it safe ?
return return
app.ptid = ptid app.ptid = ptid
......
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