From 12af01ad8938e6dd75d73f49798fd61c6504a598 Mon Sep 17 00:00:00 2001 From: Hui Li Date: Fri, 12 Jun 2020 14:35:49 +0800 Subject: [PATCH 1/3] [modify sim cases] --- tests/script/unique/arbitrator/dn3_mn1_replica_change.sim | 2 +- .../unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim | 2 +- tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim | 2 +- .../unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim | 2 +- .../unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim | 2 +- tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim | 2 +- tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim | 4 ++-- .../arbitrator/offline_replica2_alterTable_online.sim | 2 +- .../arbitrator/offline_replica2_createTable_online.sim | 2 +- .../unique/arbitrator/offline_replica2_dropDb_online.sim | 2 +- .../unique/arbitrator/offline_replica2_dropTable_online.sim | 6 +++--- .../arbitrator/offline_replica3_alterTable_online.sim | 2 +- .../arbitrator/offline_replica3_createTable_online.sim | 2 +- .../unique/arbitrator/offline_replica3_dropDb_online.sim | 2 +- .../unique/arbitrator/offline_replica3_dropTable_online.sim | 6 +++--- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim index 09654ca8a9..5e4b9b4154 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim @@ -51,7 +51,7 @@ system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 sleep 3000 -$totalTableNum = 10000 +$totalTableNum = 10 $sleepTimer = 10000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim index 4f29989aff..b870d07c1d 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 1000 +$totalTableNum = 10 $sleepTimer = 10000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim index c156d7d55c..fda850d2c9 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim index be4c321c36..b0a01e4487 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 #sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim index 1345bac4f8..c969555538 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 #sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim index 46b4023aa2..82f2aad07b 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim index b6a2b7e1d5..4e9afbf31a 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -152,7 +152,7 @@ print ============== step4: restart dnode2, then create database with replica 2, system sh/exec.sh -n dnode2 -s start sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db1 diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim index bcbb7e81a5..26a6359a5c 100644 --- a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim index e9b5e484eb..e7b2c70c78 100644 --- a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $maxTables = $totalTableNum * 2 diff --git a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim index e2ffc2ab1d..20c575d382 100644 --- a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim index ba8b1cd3b5..9f72cde440 100644 --- a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -146,14 +146,14 @@ endi print ============== step4: drop some tables $i = 1 -$dropTblNum = 21 +$dropTblNum = 6 while $i < $dropTblNum $tb = tb . $i sql drop table if exists $tb $i = $i + 1 endw -$tblNum = $tblNum - 20 +$tblNum = $tblNum - 5 print ============== step5: restart dnode4, waiting dnode4 synced system sh/exec.sh -n dnode4 -s start diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim index c7f02fdc51..43f9dfff14 100644 --- a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim index 113d322d85..1e47157975 100644 --- a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $maxTables = $totalTableNum * 2 diff --git a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim index 0c7211d9e5..c9fc91527d 100644 --- a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim index 8e59acc234..aecf41b892 100644 --- a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -146,14 +146,14 @@ endi print ============== step4: drop some tables $i = 1 -$dropTblNum = 21 +$dropTblNum = 6 while $i < $dropTblNum $tb = tb . $i sql drop table if exists $tb $i = $i + 1 endw -$tblNum = $tblNum - 20 +$tblNum = $tblNum - 5 print ============== step5: restart dnode4, waiting dnode4 synced system sh/exec.sh -n dnode4 -s start From 96d4527331f06faba4e00f9f45f37069e1e76c5f Mon Sep 17 00:00:00 2001 From: Hui Li Date: Fri, 12 Jun 2020 15:31:42 +0800 Subject: [PATCH 2/3] [modify sim case] --- .../unique/arbitrator/offline_replica2_alterTag_online.sim | 6 +++--- .../unique/arbitrator/offline_replica3_alterTag_online.sim | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim index 54e5c6a81f..b883f077c2 100644 --- a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim @@ -67,7 +67,7 @@ sql use $db # create table , insert data $stb = stb -sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int) +sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int) $rowNum = 500 $tblNum = $totalTableNum $totalRows = 0 @@ -77,7 +77,7 @@ $tsEnd = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i ) + sql create table $tb using $stb tags( $i , $i ) $x = 0 while $x < $rowNum @@ -164,7 +164,7 @@ $totalRows = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i , $i ) + sql create table $tb using $stb tags( $i , $i , $i ) $x = 0 while $x < $rowNum diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim index 97a8a0d6e0..e27bbafba7 100644 --- a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim @@ -67,7 +67,7 @@ sql use $db # create table , insert data $stb = stb -sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int) +sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int) $rowNum = 500 $tblNum = $totalTableNum $totalRows = 0 @@ -77,7 +77,7 @@ $tsEnd = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i ) + sql create table $tb using $stb tags( $i , $i ) $x = 0 while $x < $rowNum @@ -164,7 +164,7 @@ $totalRows = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i , $i ) + sql create table $tb using $stb tags( $i , $i , $i ) $x = 0 while $x < $rowNum From 3e570b4c05273efd199e829b45dacbe1592cd2cc Mon Sep 17 00:00:00 2001 From: Hui Li Date: Fri, 12 Jun 2020 15:41:48 +0800 Subject: [PATCH 3/3] [modify] --- tests/script/unique/arbitrator/dn3_mn1_replica_change.sim | 2 +- tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim | 2 +- .../unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim | 2 +- .../unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim index 5e4b9b4154..1652470346 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim @@ -192,7 +192,7 @@ if $data00 != $totalRows then endi -print ============== step4: stop dnode2 for checking if sync success +print ============== step4: stop dnode2 for checking if sync ok system sh/exec.sh -n dnode2 -s stop sleep $sleepTimer diff --git a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim index 04933ea6e9..1b0a184690 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim @@ -173,7 +173,7 @@ if $rows != 3 then return -1 endi -print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should success +print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should ok system sh/exec.sh -n dnode4 -s stop system rm -rf ../../../sim/dnode4 diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim index b0a01e4487..d556976a43 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim @@ -177,7 +177,7 @@ if $data00 != $totalRows then return -1 endi -print ============== step5: stop dnode2, and check if dnode3 sync success +print ============== step5: stop dnode2, and check if dnode3 sync ok system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep $sleepTimer wait_dnode2_offline_0: diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim index c969555538..968a93156e 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim @@ -105,7 +105,7 @@ if $data00 != $totalRows then return -1 endi -print ============== step5: stop dnode2, and check if dnode3 sync success +print ============== step5: stop dnode2, and check if dnode3 sync ok system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep $sleepTimer wait_dnode2_offline_0: