From 3e22caeda5a29d1d59951f6c8fb3f98f18ddbed9 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 19 Aug 2011 12:20:29 +0100
Subject: [PATCH] Offline node when adding it to a merged cluster
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
tools/cluster-merge | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 9b62f6f87..d2c72cf69 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -316,6 +316,10 @@ class Merger(object):
for node in other_config.GetNodeList():
node_info = other_config.GetNodeInfo(node)
+ # Offline the node, it will be reonlined later at node readd
+ node_info.master_candidate = False
+ node_info.drained = False
+ node_info.offline = True
my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
fake_ec_id += 1
--
GitLab