On Tue, Feb 15, 2011 at 03:59:59PM +0100, Michael Hanselmann wrote: > Am 15. Februar 2011 15:46 schrieb Stephen Shirley <[email protected]>: > > --- a/tools/cluster-merge > > +++ b/tools/cluster-merge > > for node in other_config.GetNodeList(): > > node_info = other_config.GetNodeInfo(node) > > - node_info.master_candidate = False > > my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id)) > > Becoming a master candidate involves more than just setting a flag. > Configuration and queue files need to be copied, for example.
Isn't that take care of by the re-add command? The code tells me that this is done correctly (via context.ReaddNode, and config.Update). So I'd say LGTM, if cluster verify doesn't warn after the merge. iustin
