From 4d450cc30663b85959f1a560963e81f8fca5be9c Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 18 Nov 2020 11:04:59 +0000
Subject: [PATCH] TD-2147

---
 tests/script/jenkins/basic.txt            |  2 +
 tests/script/unique/dnode/monitor.sim     | 92 +++++++++++++++++++++++
 tests/script/unique/dnode/monitor_bug.sim | 34 ++++++---
 3 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 tests/script/unique/dnode/monitor.sim

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index daf92679bd..64a6c871fc 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -277,6 +277,8 @@ 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
diff --git a/tests/script/unique/dnode/monitor.sim b/tests/script/unique/dnode/monitor.sim
new file mode 100644
index 0000000000..1e5b0f6f56
--- /dev/null
+++ b/tests/script/unique/dnode/monitor.sim
@@ -0,0 +1,92 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+
+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 dnode1 -c minTablesPerVnode -v 10
+system sh/cfg.sh -n dnode2 -c minTablesPerVnode -v 10
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 10
+
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode2 -c monitor -v 1
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 5000
+
+sql show dnodes
+print dnode1 openVnodes $data3_1
+if $data2_1 != 0 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+sleep 10000
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 1 then
+	return -1
+endi
+
+print ========== step3
+sql show log.tables
+
+print $data00
+print $data10
+print $data20
+print $data30
+print $data40
+print $data50
+
+if $rows != 5 then
+	return -1
+endi
+
+print ========== step4
+sql select * from log.dn1
+print $rows
+$rows1 = $rows
+
+sleep 3000
+sql select * from log.dn1
+print $rows
+$rows2 = $rows
+
+if $rows2 <= $rows1 then
+	return -1
+endi
+
+print ========== step5
+sql select * from log.dn2
+print $rows
+$rows1 = $rows
+
+sleep 3000
+sql select * from log.dn2
+print $rows
+$rows2 = $rows
+
+if $rows2 <= $rows1 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
index 519aae6ca9..3169c7cdba 100644
--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -18,8 +18,8 @@ sql connect
 sleep 5000
 
 sql show dnodes
-print dnode1 openVnodes $data3_1
-if $data3_1 != 3 then
+print dnode1 openVnodes $data2_1
+if $data2_1 != 1 then
 	return -1
 endi
 
@@ -31,22 +31,21 @@ $x = 0
 show2: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 30 then
+	if $x == 10 then
 		return -1
 	endi
 	
 sql show dnodes
-print dnode1 openVnodes $data3_1
-print dnode2 openVnodes $data3_2
-if $data3_1 != 4 then
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
 	goto show2
 endi
-if $data3_2 != 3 then
+if $data2_2 != 1 then
 	goto show2
 endi
 
 print ========== step3
-sleep 3000
 sql show log.tables
 
 print $data00
@@ -56,6 +55,23 @@ print $data30
 print $data40
 print $data50
 
-if $rows != 5 then
+if $rows != 4 then
+	return -1
+endi
+
+print ========== step4
+sql select * from log.dn1
+print $rows
+$rows1 = $rows
+
+sleep 3000
+sql select * from log.dn1
+print $rows
+$rows2 = $rows
+
+if $rows2 <= $rows1 then
 	return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
-- 
GitLab