Commit 10e69ebd authored by Vincent Pelletier's avatar Vincent Pelletier

primary_master_node is not given a value any longer. Stop testing it.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@856 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 65f40be6
...@@ -63,7 +63,6 @@ class Application(object): ...@@ -63,7 +63,6 @@ class Application(object):
# partitions. # partitions.
self.pt = None self.pt = None
self.primary_master_node = None
self.replicator = None self.replicator = None
self.listening_conn = None self.listening_conn = None
self.master_conn = None self.master_conn = None
......
...@@ -99,9 +99,6 @@ class BaseMasterHandler(BaseStorageHandler): ...@@ -99,9 +99,6 @@ class BaseMasterHandler(BaseStorageHandler):
# XXX it might be better to implement this callback in each handler. # XXX it might be better to implement this callback in each handler.
uuid = conn.getUUID() uuid = conn.getUUID()
app = self.app app = self.app
if app.primary_master_node is None \
or app.primary_master_node.getUUID() != uuid:
return
for node_type, ip_address, port, uuid, state in node_list: for node_type, ip_address, port, uuid, state in node_list:
addr = (ip_address, port) addr = (ip_address, port)
......
...@@ -30,7 +30,7 @@ from neo import decorators ...@@ -30,7 +30,7 @@ from neo import decorators
# FIXME: before move handlers, this one was inheriting from EventHandler # FIXME: before move handlers, this one was inheriting from EventHandler
# instead of BaseStorageHandler # instead of BaseStorageHandler
class HiddenHandler(BaseStorageHandler): class HiddenHandler(BaseMasterHandler):
"""This class implements a generic part of the event handlers.""" """This class implements a generic part of the event handlers."""
def __init__(self, app): def __init__(self, app):
...@@ -46,9 +46,7 @@ class HiddenHandler(BaseStorageHandler): ...@@ -46,9 +46,7 @@ class HiddenHandler(BaseStorageHandler):
app = self.app app = self.app
node = app.nm.getNodeByUUID(uuid) node = app.nm.getNodeByUUID(uuid)
if node.getNodeType() != MASTER_NODE_TYPE \ if node.getNodeType() != MASTER_NODE_TYPE:
or app.primary_master_node is None \
or app.primary_master_node.getUUID() != uuid:
return return
for node_type, ip_address, port, uuid, state in node_list: for node_type, ip_address, port, uuid, state in node_list:
......
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