xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: rename LEADER to leader

This commit is contained in:
Shengliang Guan 2022-06-02 14:35:59 +08:00
parent 27c1687a05
commit e35ebdadac
26 changed files with 352 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/dnode/mnode/impl/src/mndMnode.c
View File

@ -655,7 +655,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, b1, false);
const char *roles = "OFFLINE";
const char *roles = "offline";
if (pObj->id == pMnode->selfDnodeId) {
roles = syncStr(TAOS_SYNC_STATE_LEADER);
}
@ -667,9 +667,9 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
colDataAppend(pColInfo, numOfRows, (const char *)b2, false);
const char *status = "READY";
if (objStatus == SDB_STATUS_CREATING) status = "CREATING";
if (objStatus == SDB_STATUS_DROPPING) status = "DROPPING";
const char *status = "ready";
if (objStatus == SDB_STATUS_CREATING) status = "creating";
if (objStatus == SDB_STATUS_DROPPING) status = "dropping";
char b3[9 + VARSTR_HEADER_SIZE] = {0};
STR_WITH_MAXSIZE_TO_VARSTR(b3, status, pShow->pMeta->pSchemas[cols].bytes);
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);

2
source/dnode/mnode/impl/src/mndVgroup.c
View File

@ -705,7 +705,7 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
}
char buf1[20] = {0};
const char *role = online ? syncStr(pVgroup->vnodeGid[i].role) : "OFFLINE";
const char *role = online ? syncStr(pVgroup->vnodeGid[i].role) : "offline";
STR_WITH_MAXSIZE_TO_VARSTR(buf1, role, pShow->pMeta->pSchemas[cols].bytes);
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);

8
source/libs/sync/src/syncMain.c
View File

@ -1450,12 +1450,12 @@ static void syncFreeNode(void* param) {
const char* syncStr(ESyncState state) {
switch (state) {
case TAOS_SYNC_STATE_FOLLOWER:
return "FOLLOWER";
return "follower";
case TAOS_SYNC_STATE_CANDIDATE:
return "CANDIDATE";
return "candidate";
case TAOS_SYNC_STATE_LEADER:
return "LEADER";
return "leader";
default:
return "ERROR";
return "error";
}
}

2
source/util/src/terror.c
View File

@ -190,7 +190,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_BNODE_ALREADY_EXIST, "Bnode already exists"
TAOS_DEFINE_ERROR(TSDB_CODE_MND_BNODE_NOT_EXIST, "Bnode not there")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_FEW_MNODES, "The replicas of mnode cannot less than 1")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_MNODES, "The replicas of mnode cannot exceed 3")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_CANT_DROP_MASTER, "Can't drop mnode which is LEADER")
TAOS_DEFINE_ERROR(TSDB_CODE_MND_CANT_DROP_MASTER, "Can't drop mnode which is leader")
// mnode-acct
TAOS_DEFINE_ERROR(TSDB_CODE_MND_ACCT_ALREADY_EXIST, "Account already exists")

4
tests/script/tsim/bnode/basic1.sim
View File

@ -24,7 +24,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -71,7 +71,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi

30
tests/script/tsim/db/alter_option.sim
View File

@ -131,43 +131,43 @@ endi
sleep 3000
#sql show db.vgroups
#if $data[0][4] == LEADER then
# if $data[0][6] != FOLLOWER then
#if $data[0][4] == leader then
# if $data[0][6] != follower then
# return -1
# endi
# if $data[0][8] != FOLLOWER then
# if $data[0][8] != follower then
# return -1
# endi
#endi
#if $data[0][6] == LEADER then
# if $data[0][4] != FOLLOWER then
#if $data[0][6] == leader then
# if $data[0][4] != follower then
# return -1
# endi
# if $data[0][8] != FOLLOWER then
# if $data[0][8] != follower then
# return -1
# endi
#endi
#if $data[0][8] == LEADER then
# if $data[0][4] != FOLLOWER then
#if $data[0][8] == leader then
# if $data[0][4] != follower then
# return -1
# endi
# if $data[0][6] != FOLLOWER then
# if $data[0][6] != follower then
# return -1
# endi
#endi
#
#if $data[0][4] != LEADER then
# if $data[0][4] != FOLLOWER then
#if $data[0][4] != leader then
# if $data[0][4] != follower then
# return -1
# endi
#endi
#if $data[0][6] != LEADER then
# if $data[0][6] != FOLLOWER then
#if $data[0][6] != leader then
# if $data[0][6] != follower then
# return -1
# endi
#endi
#if $data[0][8] != LEADER then
# if $data[0][8] != FOLLOWER then
#if $data[0][8] != leader then
# if $data[0][8] != follower then
# return -1
# endi
#endi

6
tests/script/tsim/db/alter_replica_13.sim
View File

@ -117,13 +117,13 @@ step4:
sql show db.vgroups
print ===> rows: $rows
print ===> $data00 $data01 $data02 $data03 $data04 $data05
if $data[0][4] != LEADER then
if $data[0][4] != leader then
goto step4
endi
if $data[0][6] != FOLLOWER then
if $data[0][6] != follower then
goto step4
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto step4
endi

4
tests/script/tsim/dnode/basic1.sim
View File

@ -27,7 +27,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -74,7 +74,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi

12
tests/script/tsim/mnode/basic1.sim
View File

@ -15,7 +15,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -59,13 +59,13 @@ endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
return -1
endi
if $data(2)[0] != 2 then
return -1
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step2
endi
@ -95,7 +95,7 @@ endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
return -1
endi
if $data(2)[0] != null then
@ -131,13 +131,13 @@ endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
return -1
endi
if $data(2)[0] != 2 then
return -1
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step3
endi

6
tests/script/tsim/mnode/basic2.sim
View File

@ -15,7 +15,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -56,13 +56,13 @@ endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
return -1
endi
if $data(2)[0] != 2 then
return -1
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step2
endi

8
tests/script/tsim/mnode/basic3.sim
View File

@ -49,13 +49,13 @@ step2:
return -1
endi
sql show mnodes -x step2
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
goto step2
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step2
endi
if $data(3)[2] != FOLLOWER then
if $data(3)[2] != follower then
goto step2
endi
@ -114,7 +114,7 @@ print $data(1)[0] $data(1)[1] $data(1)[2]
print $data(2)[0] $data(2)[1] $data(2)[2]
print $data(3)[0] $data(3)[1] $data(3)[2]
if $data(2)[2] != OFFLINE then
if $data(2)[2] != offline then
goto step5
endi

44
tests/script/tsim/mnode/basic4.sim
View File

@ -63,22 +63,22 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4]
print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4]
print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4]
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
goto step3
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step3
endi
if $data(3)[2] != OFFLINE then
if $data(3)[2] != offline then
goto step3
endi
if $data(1)[3] != READY then
if $data(1)[3] != ready then
goto step3
endi
if $data(2)[3] != READY then
if $data(2)[3] != ready then
goto step3
endi
if $data(3)[3] != CREATING then
if $data(3)[3] != creating then
goto step3
endi
@ -97,22 +97,22 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4]
print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4]
print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4]
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
goto step4
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step4
endi
if $data(3)[2] != FOLLOWER then
if $data(3)[2] != follower then
goto step4
endi
if $data(1)[3] != READY then
if $data(1)[3] != ready then
goto step4
endi
if $data(2)[3] != READY then
if $data(2)[3] != ready then
goto step4
endi
if $data(3)[3] != READY then
if $data(3)[3] != ready then
goto step4
endi
@ -132,22 +132,22 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4]
print $data[1][0] $data[1][1] $data[1][2] $data[1][3] $data[1][4]
print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4]
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
goto step5
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step5
endi
if $data(3)[2] != OFFLINE then
if $data(3)[2] != offline then
goto step5
endi
if $data(1)[3] != READY then
if $data(1)[3] != ready then
goto step5
endi
if $data(2)[3] != READY then
if $data(2)[3] != ready then
goto step5
endi
if $data(3)[3] != DROPPING then
if $data(3)[3] != dropping then
goto step5
endi
@ -169,19 +169,19 @@ print $data[2][0] $data[2][1] $data[2][2] $data[2][3] $data[2][4]
if $rows != 2 then
goto step6
endi
if $data(1)[2] != LEADER then
if $data(1)[2] != leader then
goto step6
endi
if $data(2)[2] != FOLLOWER then
if $data(2)[2] != follower then
goto step6
endi
if $data(3)[2] != null then
goto step6
endi
if $data(1)[3] != READY then
if $data(1)[3] != ready then
goto step6
endi
if $data(2)[3] != READY then
if $data(2)[3] != ready then
goto step6
endi
if $data(3)[3] != null then

4
tests/script/tsim/qnode/basic1.sim
View File

@ -24,7 +24,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -71,7 +71,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi

2
tests/script/tsim/query/explain.sim
View File

@ -1,7 +1,7 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
print ========= start dnode1 as LEADER
print ========= start dnode1 as leader
system sh/exec.sh -n dnode1 -s start
sql connect

2
tests/script/tsim/query/scalarNull.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c wallevel -v 2
system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
print ========= start dnode1 as LEADER
print ========= start dnode1 as leader
system sh/exec.sh -n dnode1 -s start
sleep 2000
sql connect

2
tests/script/tsim/query/udf.sim
View File

@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c wallevel -v 2
system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
system sh/cfg.sh -n dnode1 -c udf -v 1
print ========= start dnode1 as LEADER
print ========= start dnode1 as leader
system sh/exec.sh -n dnode1 -s start
sleep 1000
sql connect

4
tests/script/tsim/snode/basic1.sim
View File

@ -24,7 +24,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi
@ -71,7 +71,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi

54
tests/script/tsim/sync/3Replica1VgElect.sim
View File

@ -105,21 +105,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi
@ -239,21 +239,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi
@ -447,21 +447,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi

270
tests/script/tsim/sync/3Replica5VgElect.sim
View File

@ -108,21 +108,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi
@ -130,21 +130,21 @@ else
goto check_vg_ready
endi
if $data[1][4] == LEADER then
if $data[1][6] == FOLLOWER then
if $data[1][8] == FOLLOWER then
if $data[1][4] == leader then
if $data[1][6] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][3]
endi
endi
elif $data[1][6] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][8] == FOLLOWER then
elif $data[1][6] == leader then
if $data[1][4] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][5]
endi
endi
elif $data[1][8] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][6] == FOLLOWER then
elif $data[1][8] == leader then
if $data[1][4] == follower then
if $data[1][6] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][7]
endi
endi
@ -152,21 +152,21 @@ else
goto check_vg_ready
endi
if $data[2][4] == LEADER then
if $data[2][6] == FOLLOWER then
if $data[2][8] == FOLLOWER then
if $data[2][4] == leader then
if $data[2][6] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][3]
endi
endi
elif $data[2][6] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][8] == FOLLOWER then
elif $data[2][6] == leader then
if $data[2][4] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][5]
endi
endi
elif $data[2][8] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][6] == FOLLOWER then
elif $data[2][8] == leader then
if $data[2][4] == follower then
if $data[2][6] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][7]
endi
endi
@ -174,21 +174,21 @@ else
goto check_vg_ready
endi
if $data[3][4] == LEADER then
if $data[3][6] == FOLLOWER then
if $data[3][8] == FOLLOWER then
if $data[3][4] == leader then
if $data[3][6] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][3]
endi
endi
elif $data[3][6] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][8] == FOLLOWER then
elif $data[3][6] == leader then
if $data[3][4] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][5]
endi
endi
elif $data[3][8] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][6] == FOLLOWER then
elif $data[3][8] == leader then
if $data[3][4] == follower then
if $data[3][6] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][7]
endi
endi
@ -196,21 +196,21 @@ else
goto check_vg_ready
endi
if $data[4][4] == LEADER then
if $data[4][6] == FOLLOWER then
if $data[4][8] == FOLLOWER then
if $data[4][4] == leader then
if $data[4][6] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][3]
endi
endi
elif $data[4][6] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][8] == FOLLOWER then
elif $data[4][6] == leader then
if $data[4][4] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][5]
endi
endi
elif $data[4][8] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][6] == FOLLOWER then
elif $data[4][8] == leader then
if $data[4][4] == follower then
if $data[4][6] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][7]
endi
endi
@ -335,21 +335,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi
@ -357,21 +357,21 @@ else
goto check_vg_ready1
endi
if $data[1][4] == LEADER then
if $data[1][6] == FOLLOWER then
if $data[1][8] == FOLLOWER then
if $data[1][4] == leader then
if $data[1][6] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][3]
endi
endi
elif $data[1][6] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][8] == FOLLOWER then
elif $data[1][6] == leader then
if $data[1][4] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][5]
endi
endi
elif $data[1][8] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][6] == FOLLOWER then
elif $data[1][8] == leader then
if $data[1][4] == follower then
if $data[1][6] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][7]
endi
endi
@ -379,21 +379,21 @@ else
goto check_vg_ready1
endi
if $data[2][4] == LEADER then
if $data[2][6] == FOLLOWER then
if $data[2][8] == FOLLOWER then
if $data[2][4] == leader then
if $data[2][6] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][3]
endi
endi
elif $data[2][6] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][8] == FOLLOWER then
elif $data[2][6] == leader then
if $data[2][4] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][5]
endi
endi
elif $data[2][8] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][6] == FOLLOWER then
elif $data[2][8] == leader then
if $data[2][4] == follower then
if $data[2][6] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][7]
endi
endi
@ -401,21 +401,21 @@ else
goto check_vg_ready1
endi
if $data[3][4] == LEADER then
if $data[3][6] == FOLLOWER then
if $data[3][8] == FOLLOWER then
if $data[3][4] == leader then
if $data[3][6] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][3]
endi
endi
elif $data[3][6] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][8] == FOLLOWER then
elif $data[3][6] == leader then
if $data[3][4] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][5]
endi
endi
elif $data[3][8] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][6] == FOLLOWER then
elif $data[3][8] == leader then
if $data[3][4] == follower then
if $data[3][6] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][7]
endi
endi
@ -423,21 +423,21 @@ else
goto check_vg_ready1
endi
if $data[4][4] == LEADER then
if $data[4][6] == FOLLOWER then
if $data[4][8] == FOLLOWER then
if $data[4][4] == leader then
if $data[4][6] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][3]
endi
endi
elif $data[4][6] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][8] == FOLLOWER then
elif $data[4][6] == leader then
if $data[4][4] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][5]
endi
endi
elif $data[4][8] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][6] == FOLLOWER then
elif $data[4][8] == leader then
if $data[4][4] == follower then
if $data[4][6] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][7]
endi
endi
@ -635,21 +635,21 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] == FOLLOWER then
if $data[0][8] == FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
endi
endi
elif $data[0][6] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][8] == FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] == follower then
if $data[0][8] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
endi
endi
elif $data[0][8] == LEADER then
if $data[0][4] == FOLLOWER then
if $data[0][6] == FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] == follower then
if $data[0][6] == follower then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
endi
endi
@ -657,21 +657,21 @@ else
goto check_vg_ready3
endi
if $data[1][4] == LEADER then
if $data[1][6] == FOLLOWER then
if $data[1][8] == FOLLOWER then
if $data[1][4] == leader then
if $data[1][6] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][3]
endi
endi
elif $data[1][6] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][8] == FOLLOWER then
elif $data[1][6] == leader then
if $data[1][4] == follower then
if $data[1][8] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][5]
endi
endi
elif $data[1][8] == LEADER then
if $data[1][4] == FOLLOWER then
if $data[1][6] == FOLLOWER then
elif $data[1][8] == leader then
if $data[1][4] == follower then
if $data[1][6] == follower then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][7]
endi
endi
@ -679,21 +679,21 @@ else
goto check_vg_ready3
endi
if $data[2][4] == LEADER then
if $data[2][6] == FOLLOWER then
if $data[2][8] == FOLLOWER then
if $data[2][4] == leader then
if $data[2][6] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][3]
endi
endi
elif $data[2][6] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][8] == FOLLOWER then
elif $data[2][6] == leader then
if $data[2][4] == follower then
if $data[2][8] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][5]
endi
endi
elif $data[2][8] == LEADER then
if $data[2][4] == FOLLOWER then
if $data[2][6] == FOLLOWER then
elif $data[2][8] == leader then
if $data[2][4] == follower then
if $data[2][6] == follower then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][7]
endi
endi
@ -701,21 +701,21 @@ else
goto check_vg_ready3
endi
if $data[3][4] == LEADER then
if $data[3][6] == FOLLOWER then
if $data[3][8] == FOLLOWER then
if $data[3][4] == leader then
if $data[3][6] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][3]
endi
endi
elif $data[3][6] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][8] == FOLLOWER then
elif $data[3][6] == leader then
if $data[3][4] == follower then
if $data[3][8] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][5]
endi
endi
elif $data[3][8] == LEADER then
if $data[3][4] == FOLLOWER then
if $data[3][6] == FOLLOWER then
elif $data[3][8] == leader then
if $data[3][4] == follower then
if $data[3][6] == follower then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][7]
endi
endi
@ -723,21 +723,21 @@ else
goto check_vg_ready3
endi
if $data[4][4] == LEADER then
if $data[4][6] == FOLLOWER then
if $data[4][8] == FOLLOWER then
if $data[4][4] == leader then
if $data[4][6] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][3]
endi
endi
elif $data[4][6] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][8] == FOLLOWER then
elif $data[4][6] == leader then
if $data[4][4] == follower then
if $data[4][8] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][5]
endi
endi
elif $data[4][8] == LEADER then
if $data[4][4] == FOLLOWER then
if $data[4][6] == FOLLOWER then
elif $data[4][8] == leader then
if $data[4][4] == follower then
if $data[4][6] == follower then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][7]
endi
endi

24
tests/script/tsim/sync/oneReplica1VgElect.sim
View File

@ -103,13 +103,13 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
goto vg_ready
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
goto vg_ready
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
goto vg_ready
else
@ -154,11 +154,11 @@ switch_leader_to_offine_loop:
print ====> finde vnode of leader, and stop the dnode where the vnode is located, and query stb/ntb count(*)
sql show vgroups
print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $data[0][6] $data[0][7] $data[0][8] $data[0][9] $data[0][6] $data[0][11] $data[0][12] $data[0][13]
if $data[0][4] == LEADER then
if $data[0][4] == leader then
$dnodeId = $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
$dnodeId = $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
$dnodeId = $data[0][7]
else
print ====> no leader vnode!!!
@ -186,13 +186,13 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == OFFLINE then
if $data[0][4] == offline then
print ---- vgroup $dnodeId leader switch to offline
goto vg_offline_1
elif $data[0][6] == OFFLINE then
elif $data[0][6] == offline then
print ---- vgroup $dnodeId leader switch to offline
goto vg_offline_1
elif $data[0][8] == OFFLINE then
elif $data[0][8] == offline then
print ---- vgroup $dnodeId leader switch to offline
goto vg_offline_1
else
@ -218,13 +218,13 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
goto countinu_loop
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
goto countinu_loop
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
goto countinu_loop
else

24
tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim
View File

@ -104,7 +104,7 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
if $data[0][6] != NULL then
goto check_vg_ready
endi
@ -114,7 +114,7 @@ if $data[0][4] == LEADER then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
goto vg_ready
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
if $data[0][4] != NULL then
goto check_vg_ready
endi
@ -124,7 +124,7 @@ if $data[0][6] == LEADER then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
goto vg_ready
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
if $data[0][4] != NULL then
goto check_vg_ready
endi
@ -208,11 +208,11 @@ switch_leader_loop:
print ====> finde vnode of leader, and stop the dnode where the vnode is located, and query stb/ntb count(*)
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][4] == leader then
$dnodeId = $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
$dnodeId = $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
$dnodeId = $data[0][7]
else
print ====> no leader vnode!!!
@ -238,7 +238,7 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
if $data[0][6] != NULL then
goto check_vg_ready_2
endi
@ -248,7 +248,7 @@ if $data[0][4] == LEADER then
print ---- vgroup $data[0][0] leader switch to dnode $data[0][3]
goto vg_ready_2
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
if $data[0][4] != NULL then
goto check_vg_ready_2
endi
@ -258,7 +258,7 @@ if $data[0][6] == LEADER then
print ---- vgroup $data[0][0] leader switch to dnode $data[0][5]
goto vg_ready_2
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
if $data[0][4] != NULL then
goto check_vg_ready_2
endi
@ -343,7 +343,7 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
if $data[0][6] != NULL then
goto check_vg_ready_1
endi
@ -352,7 +352,7 @@ if $data[0][4] == LEADER then
endi
goto vg_ready_1
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
if $data[0][4] != NULL then
goto check_vg_ready_1
endi
@ -361,7 +361,7 @@ if $data[0][6] == LEADER then
endi
goto vg_ready_1
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
if $data[0][4] != NULL then
goto check_vg_ready_1
endi

60
tests/script/tsim/sync/oneReplica5VgElect.sim
View File

@ -104,51 +104,51 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready
endi
if $data[1][4] == LEADER then
if $data[1][4] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[0][3]
elif $data[1][6] == LEADER then
elif $data[1][6] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[0][5]
elif $data[1][8] == LEADER then
elif $data[1][8] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready
endi
if $data[2][4] == LEADER then
if $data[2][4] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[0][3]
elif $data[2][6] == LEADER then
elif $data[2][6] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[0][5]
elif $data[2][8] == LEADER then
elif $data[2][8] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready
endi
if $data[3][4] == LEADER then
if $data[3][4] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[0][3]
elif $data[3][6] == LEADER then
elif $data[3][6] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[0][5]
elif $data[3][8] == LEADER then
elif $data[3][8] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready
endi
if $data[4][4] == LEADER then
if $data[4][4] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[0][3]
elif $data[4][6] == LEADER then
elif $data[4][6] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[0][5]
elif $data[4][8] == LEADER then
elif $data[4][8] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready
@ -272,51 +272,51 @@ if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
else
goto check_vg_ready1
endi
if $data[1][4] == LEADER then
if $data[1][4] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][3]
elif $data[1][6] == LEADER then
elif $data[1][6] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][5]
elif $data[1][8] == LEADER then
elif $data[1][8] == leader then
print ---- vgroup $data[1][0] leader locate on dnode $data[1][7]
else
goto check_vg_ready1
endi
if $data[2][4] == LEADER then
if $data[2][4] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][3]
elif $data[2][6] == LEADER then
elif $data[2][6] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][5]
elif $data[2][8] == LEADER then
elif $data[2][8] == leader then
print ---- vgroup $data[2][0] leader locate on dnode $data[2][7]
else
goto check_vg_ready
endi
if $data[3][4] == LEADER then
if $data[3][4] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][3]
elif $data[3][6] == LEADER then
elif $data[3][6] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][5]
elif $data[3][8] == LEADER then
elif $data[3][8] == leader then
print ---- vgroup $data[3][0] leader locate on dnode $data[3][7]
else
goto check_vg_ready1
endi
if $data[4][4] == LEADER then
if $data[4][4] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][3]
elif $data[4][6] == LEADER then
elif $data[4][6] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][5]
elif $data[4][8] == LEADER then
elif $data[4][8] == leader then
print ---- vgroup $data[4][0] leader locate on dnode $data[4][7]
else
goto check_vg_ready1

42
tests/script/tsim/sync/threeReplica1VgElect.sim
View File

@ -104,7 +104,7 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
if $data[0][6] != FLLOWER then
goto check_vg_ready
endi
@ -114,7 +114,7 @@ if $data[0][4] == LEADER then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
goto vg_ready
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
if $data[0][4] != FLLOWER then
goto check_vg_ready
endi
@ -124,7 +124,7 @@ if $data[0][6] == LEADER then
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
goto vg_ready
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
if $data[0][4] != FLLOWER then
goto check_vg_ready
endi
@ -199,11 +199,11 @@ endi
print ====> finde vnode of leader, and stop the dnode where the vnode is located, and query stb/ntb count(*)
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][4] == leader then
$dnodeId = $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
$dnodeId = $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
$dnodeId = $data[0][7]
else
print ====> no leader vnode!!!
@ -216,11 +216,11 @@ system sh/exec.sh -n $dnodeId -s stop -x SIGINT
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][4] == leader then
print ---- vgroup $data[0][0] leader switch to dnode $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
print ---- vgroup $data[0][0] leader switch to dnode $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
print ---- vgroup $data[0][0] leader switch to dnode $data[0][7]
else
print ====> no leader vnode!!!
@ -264,7 +264,7 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][4] == leader then
if $data[0][6] != FLLOWER then
goto check_vg_ready_1
endi
@ -273,7 +273,7 @@ if $data[0][4] == LEADER then
endi
goto vg_ready_1
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
if $data[0][4] != FLLOWER then
goto check_vg_ready_1
endi
@ -282,7 +282,7 @@ if $data[0][6] == LEADER then
endi
goto vg_ready_1
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
if $data[0][4] != FLLOWER then
goto check_vg_ready_1
endi
@ -325,27 +325,27 @@ system sh/exec.sh -n $dnodeId -s stop -x SIGINT
check_vg_ready_3:
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][6] == LEADER then
if $data[0][4] == leader then
if $data[0][6] == leader then
goto check_vg_ready_3
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][5]
elif $data[0][6] == LEADER then
if $data[0][4] == LEADER then
elif $data[0][6] == leader then
if $data[0][4] == leader then
goto check_vg_ready_3
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][7]
elif $data[0][8] == LEADER then
if $data[0][4] == LEADER then
elif $data[0][8] == leader then
if $data[0][4] == leader then
goto check_vg_ready_3
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][9]

78
tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
View File

@ -103,29 +103,29 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] != FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] != follower then
goto check_vg_ready
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready
endi
print ---- vgroup $data[0][0] leader locate on dnode $data[0][3]
goto vg_ready
elif $data[0][6] == LEADER then
if $data[0][4] != FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] != follower then
goto check_vg_ready
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready
endi
print ---- vgroup $data[0][0] leader locate on dnode $data[0][5]
goto vg_ready
elif $data[0][8] == LEADER then
if $data[0][4] != FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] != follower then
goto check_vg_ready
endi
if $data[0][6] != FOLLOWER then
if $data[0][6] != follower then
goto check_vg_ready
endi
print ---- vgroup $data[0][0] leader locate on dnode $data[0][7]
@ -193,11 +193,11 @@ switch_leader_loop:
print ====> finde vnode of leader, and stop the dnode where the vnode is located, and query stb/ntb count(*)
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][4] == leader then
$dnodeId = $data[0][3]
elif $data[0][6] == LEADER then
elif $data[0][6] == leader then
$dnodeId = $data[0][5]
elif $data[0][8] == LEADER then
elif $data[0][8] == leader then
$dnodeId = $data[0][7]
else
print ====> no leader vnode!!!
@ -226,29 +226,29 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] != FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] != follower then
goto check_vg_ready_2
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready_2
endi
print ---- vgroup $dnodeId leader switch to dnode $data[0][3]
goto vg_ready_2
elif $data[0][6] == LEADER then
if $data[0][4] != FOLLOWER then
elif $data[0][6] == leader then
if $data[0][4] != follower then
goto check_vg_ready_2
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready_2
endi
print ---- vgroup $dnodeId leader switch to dnode $data[0][5]
goto vg_ready_2
elif $data[0][8] == LEADER then
if $data[0][4] != FOLLOWER then
elif $data[0][8] == leader then
if $data[0][4] != follower then
goto check_vg_ready_2
endi
if $data[0][6] != FOLLOWER then
if $data[0][6] != follower then
goto check_vg_ready_2
endi
print ---- vgroup $dnodeId leader switch to dnode $data[0][7]
@ -329,29 +329,29 @@ print $data[0][0] $data[0][1] $data[0][2] $data[0][3] $data[0][4] $data[0][5] $d
if $rows != $vgroups then
return -1
endi
if $data[0][4] == LEADER then
if $data[0][6] != FOLLOWER then
if $data[0][4] == leader then
if $data[0][6] != follower then
goto check_vg_ready_1
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready_1
endi
goto vg_ready_1
endi
if $data[0][6] == LEADER then
if $data[0][4] != FOLLOWER then
if $data[0][6] == leader then
if $data[0][4] != follower then
goto check_vg_ready_1
endi
if $data[0][8] != FOLLOWER then
if $data[0][8] != follower then
goto check_vg_ready_1
endi
goto vg_ready_1
endi
if $data[0][8] == LEADER then
if $data[0][4] != FOLLOWER then
if $data[0][8] == leader then
if $data[0][4] != follower then
goto check_vg_ready_1
endi
if $data[0][6] != FOLLOWER then
if $data[0][6] != follower then
goto check_vg_ready_1
endi
goto vg_ready_1
@ -390,27 +390,27 @@ system sh/exec.sh -n $dnodeId -s stop -x SIGINT
check_vg_ready_3:
sql show vgroups
print $data(2)[0] $data(2)[1] $data(2)[2] $data(2)[3] $data(2)[4] $data(2)[5] $data(2)[6] $data(2)[7] $data(2)[8] $data(2)[9] $data(2)[10] $data(2)[11] $data(2)[12] $data(2)[13]
if $data[0][4] == LEADER then
if $data[0][6] == LEADER then
if $data[0][4] == leader then
if $data[0][6] == leader then
goto check_vg_ready_3
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][5]
elif $data[0][6] == LEADER then
if $data[0][4] == LEADER then
elif $data[0][6] == leader then
if $data[0][4] == leader then
goto check_vg_ready_3
endi
if $data[0][8] == LEADER then
if $data[0][8] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][7]
elif $data[0][8] == LEADER then
if $data[0][4] == LEADER then
elif $data[0][8] == leader then
if $data[0][4] == leader then
goto check_vg_ready_3
endi
if $data[0][6] == LEADER then
if $data[0][6] == leader then
goto check_vg_ready_3
endi
print ---- vgroup $data[0][0] leader locating dnode $data[0][9]

2
tests/script/tsim/trans/create_db.sim
View File

@ -26,7 +26,7 @@ if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
if $data02 != leader then
return -1
endi

2
tests/system-test/0-others/taosdMonitor.py
View File

@ -75,7 +75,7 @@ def telemetryInfoCheck(infoDict=''):
if k not in infoDict["cluster_info"]["dnodes"][0] or v != infoDict["cluster_info"]["dnodes"][0][k] :
tdLog.exit("dnodes info is null!")
mnodes_info = { "mnode_id":1, "mnode_ep":f"{hostname}:{serverPort}","role": "LEADER" }
mnodes_info = { "mnode_id":1, "mnode_ep":f"{hostname}:{serverPort}","role": "leader" }
for k ,v in mnodes_info.items():
if k not in infoDict["cluster_info"]["mnodes"][0] or v != infoDict["cluster_info"]["mnodes"][0][k] :