Commit 47265fb3 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Master keep the UUID supplied by storage nodes considered as pending. This is no

more an issue with non-empty nodes since commit #1228.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1234 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent a6cde7db
...@@ -799,13 +799,14 @@ class Application(object): ...@@ -799,13 +799,14 @@ class Application(object):
if uuid is None or node is None: if uuid is None or node is None:
# if node is unknown, it has been forget when the current # if node is unknown, it has been forget when the current
# partition was validated by the admin # partition was validated by the admin
uuid = None # Here the uuid is not cleared to allow lookup pending nodes by
# uuid from the test framework. It's safe since nodes with a
# conflicting UUID are rejected in the identification handler.
state = protocol.PENDING_STATE state = protocol.PENDING_STATE
handler = verification.VerificationHandler handler = verification.VerificationHandler
elif self.cluster_state == protocol.RUNNING: elif self.cluster_state == protocol.RUNNING:
if uuid is None or node is None: if uuid is None or node is None:
# same as for verification # same as for verification
uuid = None
state = protocol.PENDING_STATE state = protocol.PENDING_STATE
handler = storage.StorageServiceHandler handler = storage.StorageServiceHandler
elif self.cluster_state == protocol.STOPPING: elif self.cluster_state == protocol.STOPPING:
......
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