Commit 63d41bc0 authored by Aurel's avatar Aurel

if number of replicas is different between PMN and SN, use the one

given per PMN as it not an issue to change it


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@459 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent b3f868de
...@@ -177,7 +177,9 @@ class BootstrapEventHandler(StorageEventHandler): ...@@ -177,7 +177,9 @@ class BootstrapEventHandler(StorageEventHandler):
conn.close() conn.close()
return return
if app.num_partitions is None or app.num_replicas is None: if app.num_partitions is None or app.num_replicas is None or \
app.num_replicas != num_replicas:
# changing number of replicas is not an issue
app.num_partitions = num_partitions app.num_partitions = num_partitions
app.dm.setNumPartitions(app.num_partitions) app.dm.setNumPartitions(app.num_partitions)
app.num_replicas = num_replicas app.num_replicas = num_replicas
...@@ -188,6 +190,7 @@ class BootstrapEventHandler(StorageEventHandler): ...@@ -188,6 +190,7 @@ class BootstrapEventHandler(StorageEventHandler):
elif app.num_partitions != num_partitions: elif app.num_partitions != num_partitions:
raise RuntimeError('the number of partitions is inconsistent') raise RuntimeError('the number of partitions is inconsistent')
if your_uuid != INVALID_UUID and app.uuid != your_uuid: if your_uuid != INVALID_UUID and app.uuid != your_uuid:
# got an uuid from the primary master # got an uuid from the primary master
app.uuid = your_uuid app.uuid = your_uuid
......
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