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

[TD-150] Let mnode changes be processed in a status message

This commit is contained in:
slguan 2020-05-02 23:12:51 +08:00
parent 099ffbd0bf
commit 69dbb70ae8
6 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mnode/src/mgmtDb.c
View File

@ -261,6 +261,13 @@ static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) {
return TSDB_CODE_INVALID_OPTION;
}
#ifndef _SYNC
if (pCfg->replications != 1) {
mError("invalid db option replications:%d can only be 1 in this version", pCfg->replications);
return TSDB_CODE_INVALID_OPTION;
}
#endif
return TSDB_CODE_SUCCESS;
}

6
src/mnode/src/mgmtSdb.c
View File

@ -184,6 +184,7 @@ void sdbUpdateMnodeRoles() {
if (pMnode != NULL) {
pMnode->role = roles.role[i];
sdbPrint("mnode:%d, role:%s", pMnode->mnodeId, mgmtGetMnodeRoleStr(pMnode->role));
if (pMnode->mnodeId == dnodeGetDnodeId()) tsSdbObj.role = pMnode->role;
mgmtDecMnodeRef(pMnode);
}
}
@ -221,7 +222,7 @@ static int32_t sdbForwardToPeer(SWalHead *pHead) {
int32_t code = syncForwardToPeer(tsSdbObj.sync, pHead, (void*)pHead->version);
if (code > 0) {
sdbTrace("forward request is sent, version:%" PRIu64 ", result:%s", pHead->version, tstrerror(code));
sdbTrace("forward request is sent, version:%" PRIu64 ", code:%d", pHead->version, code);
sem_wait(&tsSdbObj.sem);
return tsSdbObj.code;
}
@ -288,12 +289,13 @@ void sdbUpdateSync() {
syncInfo.confirmForward = sdbConfirmForward;
syncInfo.notifyRole = sdbNotifyRole;
tsSdbObj.cfg = syncCfg;
if (tsSdbObj.sync) {
syncReconfig(tsSdbObj.sync, &syncCfg);
} else {
tsSdbObj.sync = syncStart(&syncInfo);
}
sdbUpdateMnodeRoles();
}
int32_t sdbInit() {

27
tests/script/unique/column/replica3.sim
View File

@ -1,39 +1,36 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode2 -c commitLog -v 0
system sh/cfg.sh -n dnode3 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c clog -v 2
system sh/cfg.sh -n dnode2 -c clog -v 2
system sh/cfg.sh -n dnode3 -c clog -v 2
system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
system sh/exec.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql connect
sql create dnode $hostname2
sql create dnode $hostname3
system sh/exec.sh -n dnode2 -s start
system sh/exec.sh -n dnode3 -s start
system sh/exec_up.sh -n dnode2 -s start
system sh/exec_up.sh -n dnode3 -s start
sql create database db replica 3
sql use db
sql create table mt (ts timestamp, f1 float, f2 float, f3 float, f4 float, f5 float, f6 float, f7 float, f8 float, f9 float, f10 float) tags (t1 int, t2 int)
sql create table tb1 using mt tags(1, 2)
sql create table db.mt (ts timestamp, f1 float, f2 float, f3 float, f4 float, f5 float, f6 float, f7 float, f8 float, f9 float, f10 float) tags (t1 int, t2 int)
sql create table db.tb1 using db.mt tags(1, 2)
sleep 3001
$x = 1000
while $x < 2000
while $x < 1010
sql insert into tb1 values (now+1s , $x , $x , $x , $x , $x , $x , $x , $x , $x , $x )
$x = $x + 1
endw
system sh/exec.sh -n dnode1 -s stop
system sh/exec.sh -n dnode2 -s stop
system sh/exec.sh -n dnode3 -s stop
system sh/exec_up.sh -n dnode1 -s stop
system sh/exec_up.sh -n dnode2 -s stop
system sh/exec_up.sh -n dnode3 -s stop

8
tests/script/unique/metrics/testSuite.sim
View File

@ -1,4 +1,4 @@
run unique/metrics/disk.sim
run unique/metrics/metrics.sim
run unique/metrics/values.sim
run unique/metrics/vnode3.sim
#run unique/metrics/disk.sim
#run unique/metrics/metrics.sim
#run unique/metrics/values.sim
#run unique/metrics/vnode3.sim

30
tests/script/unique/stream/testSuite.sim
View File

@ -1,15 +1,15 @@
run unique/stream/table_replica1_dnode2.sim
run unique/stream/metrics_replica1_dnode2.sim
run unique/stream/table_replica2_dnode2.sim
run unique/stream/metrics_replica2_dnode2.sim
run unique/stream/table_replica2_dnode2_vnoden.sim
run unique/stream/metrics_replica2_dnode2_vnoden.sim
run unique/stream/table_replica2_dnode3.sim
run unique/stream/metrics_replica2_dnode3.sim
run unique/stream/table_replica3_dnode4.sim
run unique/stream/metrics_replica3_dnode4.sim
run unique/stream/table_vnode_stop.sim
run unique/stream/metrics_vnode_stop.sim
#run unique/stream/table_balance.sim
#run unique/stream/metrics_balance.sim
#run unique/stream/table_move.sim
#run unique/stream/table_replica1_dnode2.sim
#run unique/stream/metrics_replica1_dnode2.sim
#run unique/stream/table_replica2_dnode2.sim
#run unique/stream/metrics_replica2_dnode2.sim
#run unique/stream/table_replica2_dnode2_vnoden.sim
#run unique/stream/metrics_replica2_dnode2_vnoden.sim
#run unique/stream/table_replica2_dnode3.sim
#run unique/stream/metrics_replica2_dnode3.sim
#run unique/stream/table_replica3_dnode4.sim
#run unique/stream/metrics_replica3_dnode4.sim
#run unique/stream/table_vnode_stop.sim
#run unique/stream/metrics_vnode_stop.sim
##run unique/stream/table_balance.sim
##run unique/stream/metrics_balance.sim
##run unique/stream/table_move.sim

1
tests/script/unique/vnode/replica2_basic.sim
View File

@ -1,6 +1,5 @@
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 commitLog -v 0