From dbd027a97a47ac9df11bce06a4ca4c5ec2254fa3 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Fri, 29 Jan 2010 15:34:21 +0000 Subject: [PATCH] Remove BOOTING cluster state. This state was only internal to master node, and was not even consistently handled in master (only the first election was done in that state). changeClusterState was never called with that state as parameter. Finally, remove this state from protocol as it's not used any longer. git-svn-id: https://svn.erp5.org/repos/neo/trunk@1550 71dcc9de-d417-0410-9af5-da40c76e7ee4 --- neo/master/app.py | 5 +---- neo/protocol.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/neo/master/app.py b/neo/master/app.py index 1de3ec6d..a82701aa 100644 --- a/neo/master/app.py +++ b/neo/master/app.py @@ -104,7 +104,6 @@ class Application(object): self.listening_conn = ListeningConnection(self.em, None, addr = self.server, connector_handler = self.connector_handler) - self.cluster_state = ClusterStates.BOOTING # Start the election of a primary master node. self.electPrimary() @@ -653,9 +652,7 @@ class Application(object): nm, em = self.nm, self.em # select the storage handler - if state == ClusterStates.BOOTING: - storage_handler = recovery.RecoveryHandler - elif state == ClusterStates.RECOVERING: + if state == ClusterStates.RECOVERING: storage_handler = recovery.RecoveryHandler elif state == ClusterStates.VERIFYING: storage_handler = verification.VerificationHandler diff --git a/neo/protocol.py b/neo/protocol.py index 38993433..e921f76d 100644 --- a/neo/protocol.py +++ b/neo/protocol.py @@ -38,7 +38,6 @@ class ErrorCodes(Enum): ErrorCodes = ErrorCodes() class ClusterStates(Enum): - BOOTING = Enum.Item(1) RECOVERING = Enum.Item(2) VERIFYING = Enum.Item(3) RUNNING = Enum.Item(4) -- 2.30.9