[sheepdog] [PATCH 2/8] zookeeper: fix zk_tree_destroy()

[Liu Yuan]

From: Liu Yuan <tailai.ly at taobao.com>

Even node list will be built later, we need account sd_node because in master
transfer case, we need this information to destroy the tree.

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 sheep/cluster/zookeeper.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sheep/cluster/zookeeper.c b/sheep/cluster/zookeeper.c
index ea02137..3cae0a2 100644
--- a/sheep/cluster/zookeeper.c
+++ b/sheep/cluster/zookeeper.c
@@ -300,8 +300,15 @@ static inline void zk_tree_add(struct zk_node *node)
 {
 	struct zk_node *zk = malloc(sizeof(*zk));
 	*zk = *node;
-	if (zk_tree_insert(zk))
+	if (zk_tree_insert(zk)) {
 		free(zk);
+		return;
+	}
+	/*
+	 * Even node list will be built later, we need this because in master
+	 * transfer case, we need this information to destroy the tree.
+	 */
+	sd_nodes[nr_sd_nodes++] = zk->node;
 }
 
 static inline void zk_tree_del(struct zk_node *node)
@@ -525,9 +532,9 @@ static void zk_handle_join_response(struct zk_event *ev)
 
 	if (ev->join_result == CJ_RES_MASTER_TRANSFER)
 		/*
-		 * Sheepdog assumes that only one sheep(master will kill
-		 * itself) is alive in MASTER_TRANSFER scenario. So only
-		 * the joining sheep will run into here.
+		 * Sheepdog assumes that only one sheep is alive in
+		 * MASTER_TRANSFER scenario. So only the joining sheep is
+		 * supposed to return single node view to sd_join_handler().
 		 */
 		zk_tree_destroy();
 
-- 
1.7.9.5