TD-2602

src/mnode/src/mnodeCluster.c

@@ -171,7 +171,7 @@ void mnodeUpdateClusterId() {
   void *pIter = mnodeGetNextCluster(NULL, &pCluster);
   if (pCluster != NULL) {
     tstrncpy(tsClusterId, pCluster->uid, TSDB_CLUSTER_ID_LEN);
-    mInfo("cluster id is set to %s", tsClusterId);
+    mDebug("cluster id is set to %s", tsClusterId);
   }
 
   mnodeDecClusterRef(pCluster);

src/mnode/src/mnodeMnode.c

@@ -387,6 +387,7 @@ static bool mnodeAllOnline() {
     if (pMnode == NULL) break;
     if (pMnode->role != TAOS_SYNC_ROLE_MASTER && pMnode->role != TAOS_SYNC_ROLE_SLAVE) {
       allOnline = false;
+      mDebug("mnode:%d, role:%s, not online", pMnode->mnodeId, syncRole[pMnode->role]);
       mnodeDecMnodeRef(pMnode);
     }
   }

src/mnode/src/mnodeSdb.c

@@ -225,6 +225,10 @@ void sdbUpdateMnodeRoles() {
   for (int32_t i = 0; i < tsSdbMgmt.cfg.replica; ++i) {
     SMnodeObj *pMnode = mnodeGetMnode(roles.nodeId[i]);
     if (pMnode != NULL) {
+      if (pMnode->role != roles.role[i]) {
+        bnNotify();
+      }
+
       pMnode->role = roles.role[i];
       sdbInfo("vgId:1, mnode:%d, role:%s", pMnode->mnodeId, syncRole[pMnode->role]);
       if (pMnode->mnodeId == dnodeGetDnodeId()) tsSdbMgmt.role = pMnode->role;

tests/script/jenkins/basic.txt

@@ -319,6 +319,7 @@ cd ../../../debug; make
 ./test.sh -f unique/mnode/mgmt24.sim
 ./test.sh -f unique/mnode/mgmt25.sim
 ./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt30.sim
 ./test.sh -f unique/mnode/mgmt33.sim
 ./test.sh -f unique/mnode/mgmt34.sim
 ./test.sh -f unique/mnode/mgmtr2.sim

tests/script/jenkins/unique.txt

@@ -10,6 +10,7 @@ cd ../../../debug; make
 ./test.sh -f unique/cluster/balance2.sim
 ./test.sh -f unique/cluster/balance3.sim
 ./test.sh -f unique/cluster/cache.sim
+./test.sh -f unique/cluster/vgroup100.sim
 
 ./test.sh -f unique/column/replica3.sim
 
@@ -25,12 +26,17 @@ cd ../../../debug; make
 ./test.sh -f unique/db/replica_part.sim
 
 ./test.sh -f unique/dnode/alternativeRole.sim
+./test.sh -f unique/dnode/monitor.sim
+./test.sh -f unique/dnode/monitor_bug.sim
+./test.sh -f unique/dnode/simple.sim
 ./test.sh -f unique/dnode/balance1.sim
 ./test.sh -f unique/dnode/balance2.sim
 ./test.sh -f unique/dnode/balance3.sim
 ./test.sh -f unique/dnode/balancex.sim
+./test.sh -f unique/dnode/data1.sim
 ./test.sh -f unique/dnode/m2.sim
 ./test.sh -f unique/dnode/m3.sim
+./test.sh -f unique/dnode/lossdata.sim
 ./test.sh -f unique/dnode/offline1.sim
 ./test.sh -f unique/dnode/offline2.sim
 ./test.sh -f unique/dnode/offline3.sim
@@ -54,12 +60,14 @@ cd ../../../debug; make
 ./test.sh -f unique/stable/replica3_dnode6.sim
 ./test.sh -f unique/stable/replica3_vnode3.sim
 
+./test.sh -f unique/mnode/mgmt20.sim
 ./test.sh -f unique/mnode/mgmt21.sim
 ./test.sh -f unique/mnode/mgmt22.sim
 ./test.sh -f unique/mnode/mgmt23.sim
 ./test.sh -f unique/mnode/mgmt24.sim
 ./test.sh -f unique/mnode/mgmt25.sim
 ./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt30.sim
 ./test.sh -f unique/mnode/mgmt33.sim
 ./test.sh -f unique/mnode/mgmt34.sim
 ./test.sh -f unique/mnode/mgmtr2.sim

tests/script/unique/mnode/mgmt30.sim

@@ -0,0 +1,68 @@
+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 numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 3000
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 3000
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 3000
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
+  return -1
+endi
+if $data3_2 != null then
+  return -1
+endi
+if $data3_3 != null then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+
+$x = 0
+step2: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  goto step2
+endi
+if $dnode2Role != slave then
+  goto step2
+endi
+if $dnode3Role != slave then
+  goto step2
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT