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

feat/TS-5805-force-assign-leader-fix-cases

This commit is contained in:
dmchen 2025-02-12 06:50:37 +00:00
parent b422e2b2f2
commit 977372d376
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/parser/inc/sql.y
View File

@ -863,7 +863,7 @@ cmd ::= KILL COMPACT NK_INTEGER(A).
/************************************************ merge/redistribute/ vgroup ******************************************/
cmd ::= BALANCE VGROUP. { pCxt->pRootNode = createBalanceVgroupStmt(pCxt); }
cmd ::= BALANCE VGROUP FORCE. { pCxt->pRootNode = createAssignLeaderStmt(pCxt); }
cmd ::= BALANCE LEADER FORCE. { pCxt->pRootNode = createAssignLeaderStmt(pCxt); }
cmd ::= BALANCE VGROUP LEADER on_vgroup_id(A). { pCxt->pRootNode = createBalanceVgroupLeaderStmt(pCxt, &A); }
cmd ::= BALANCE VGROUP LEADER DATABASE db_name(A). { pCxt->pRootNode = createBalanceVgroupLeaderDBNameStmt(pCxt, &A); }

20
tests/army/cluster/arbitrator_restart.py
View File

@ -46,14 +46,17 @@ class TDTestCase(TBase):
while count < 100:
tdSql.query("show arbgroups;")
if tdSql.getData(0, 4) == 1:
if tdSql.getData(0, 4) == True:
break
tdLog.info("wait 1 seconds for is sync")
time.sleep(1)
count += 1
if count == 100:
tdLog.exit("arbgroup sync failed")
return
sc.dnodeStop(2)
sc.dnodeStop(3)
@ -70,8 +73,11 @@ class TDTestCase(TBase):
time.sleep(1)
count += 1
tdSql.execute("BALANCE VGROUP FORCE;")
if count == 100:
tdLog.exit("wait candidate failed")
return
tdSql.execute("BALANCE LEADER FORCE;")
count = 0
while count < 100:
@ -84,6 +90,9 @@ class TDTestCase(TBase):
time.sleep(1)
count += 1
if count == 100:
tdLog.exit("assign leader failed")
return
tdSql.execute("INSERT INTO d0 VALUES (NOW, 10.3, 219, 0.31);")
@ -101,6 +110,9 @@ class TDTestCase(TBase):
time.sleep(1)
count += 1
if count == 100:
tdLog.exit("arbgroup sync failed")
return
def stop(self):
tdSql.close()