From 68b769cfb74f89a67dfd7a4df2319fb62d9eccc2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 23 May 2020 11:34:09 +0800
Subject: [PATCH 1/2] scripts

---
 tests/script/tmp/prepare.sim | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim
index 68a05a33e7..31d7839566 100644
--- a/tests/script/tmp/prepare.sim
+++ b/tests/script/tmp/prepare.sim
@@ -1,4 +1,14 @@
 system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
+system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
+system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
+
+return
+system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2

From f398488aac111dedc232dd137c01a239ab78f308 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 23 May 2020 13:14:38 +0800
Subject: [PATCH 2/2] fix invalid write while update mnode set

---
 src/dnode/src/dnodeMain.c | 1 +
 src/mnode/src/mgmtMnode.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 2f693c61fb..68fe986989 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -37,6 +37,7 @@ static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
 int32_t dnodeInitSystem() {
   dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_INITIALIZE);
   tscEmbedded  = 1;
+  taosBlockSIGPIPE();
   taosResolveCRC();
   taosInitGlobalCfg();
   taosReadGlobalLogCfg();
diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c
index 3ba7042c40..e9d14dc6e7 100644
--- a/src/mnode/src/mgmtMnode.c
+++ b/src/mnode/src/mgmtMnode.c
@@ -210,6 +210,9 @@ void mgmtUpdateMnodeIpSet() {
 
   mgmtMnodeWrLock();
 
+  memset(ipSet, 0, sizeof(tsMnodeRpcIpSet));
+  memset(mnodes, 0, sizeof(SDMMnodeInfos));
+
   int32_t index = 0;
   void *  pIter = NULL;
   while (1) {