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

Merge pull request #13106 from taosdata/fix/mnode 

fix: set standby while create mnode
This commit is contained in:
Shengliang Guan 2022-05-27 22:49:45 +08:00 committed by GitHub
parent e2416e40d9 335b56ed81
commit 38d69cc119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/dnode/mnode/impl/src/mndSync.c
View File

@ -219,17 +219,12 @@ void mndSyncStart(SMnode *pMnode) {
SSyncMgmt *pMgmt = &pMnode->syncMgmt; SSyncMgmt *pMgmt = &pMnode->syncMgmt;
syncSetMsgCb(pMgmt->sync, &pMnode->msgCb); syncSetMsgCb(pMgmt->sync, &pMnode->msgCb);
syncStart(pMgmt->sync);
#if 0
if (pMgmt->standby) { if (pMgmt->standby) {
syncStartStandBy(pMgmt->sync); syncStartStandBy(pMgmt->sync);
} else { } else {
syncStart(pMgmt->sync); syncStart(pMgmt->sync);
} }
#endif mDebug("sync:%" PRId64 " is started, standby:%d", pMgmt->sync, pMgmt->standby);
mDebug("sync:%" PRId64 " is started", pMgmt->sync);
} }
void mndSyncStop(SMnode *pMnode) {} void mndSyncStop(SMnode *pMnode) {}

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

@ -36,13 +36,14 @@ if $data(2)[4] != ready then
goto step1 goto step1
endi endi
print =============== create drop mnode 1
sql_error create mnode on dnode 1 sql_error create mnode on dnode 1
sql_error drop mnode on dnode 1 sql_error drop mnode on dnode 1
print =============== create mnode 2
sql create mnode on dnode 2 sql create mnode on dnode 2
$x = 0 $x = 0
step1: step2:
$x = $x + 1 $x = $x + 1
sleep 1000 sleep 1000
if $x == 20 then if $x == 20 then
@ -65,11 +66,11 @@ if $data(2)[0] != 2 then
return -1 return -1
endi endi
if $data(2)[2] != FOLLOWER then if $data(2)[2] != FOLLOWER then
goto step1 goto step2
endi endi
sleep 2000 sleep 2000
print ============ drop mnodes print ============ drop mnode 2
sql drop mnode on dnode 2 sql drop mnode on dnode 2
sql show mnodes sql show mnodes
if $rows != 1 then if $rows != 1 then