Commit 6c2dcc1a authored by Vincent Pelletier's avatar Vincent Pelletier

Remove timeout triggering cluster state change. It makes it mandatory to use...

Remove timeout triggering cluster state change. It makes it mandatory to use neoctl to setup a cluster from scratch.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@901 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent cac80ee6
...@@ -369,12 +369,8 @@ class Application(object): ...@@ -369,12 +369,8 @@ class Application(object):
self.target_uuid = None self.target_uuid = None
# collect the last partition table available # collect the last partition table available
start_time = time()
while self.cluster_state == protocol.RECOVERING: while self.cluster_state == protocol.RECOVERING:
em.poll(1) em.poll(1)
# FIXME: remove this timeout to force manual startup
if start_time + 5 <= time():
self.changeClusterState(protocol.VERIFYING)
logging.info('startup allowed') logging.info('startup allowed')
if self.pt.getID() is None: if self.pt.getID() is None:
......
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