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

fix: status msg

This commit is contained in:
Shengliang Guan 2022-05-26 20:21:00 +08:00
parent c8d5575030
commit 5687135b70
3 changed files with 115 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
View File

@ -93,7 +93,11 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
dmGetMnodeEpSet(pMgmt->pData, &epSet); dmGetMnodeEpSet(pMgmt->pData, &epSet);
rpcSendRecv(pMgmt->msgCb.clientRpc, &epSet, &rpcMsg, &rpcRsp); rpcSendRecv(pMgmt->msgCb.clientRpc, &epSet, &rpcMsg, &rpcRsp);
if (rpcRsp.code != 0) { if (rpcRsp.code != 0) {
dError("failed to send status msg since %s", tstrerror(rpcRsp.code)); dError("failed to send status msg since %s, numOfEps:%d inUse:%d", tstrerror(rpcRsp.code), epSet.numOfEps,
epSet.inUse);
for (int32_t i = 0; i < epSet.numOfEps; ++i) {
dDebug("index:%d, mnode ep:%s:%u", i, epSet.eps[i].fqdn, epSet.eps[i].port);
}
} else { } else {
dmProcessStatusRsp(pMgmt, &rpcRsp); dmProcessStatusRsp(pMgmt, &rpcRsp);
} }

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

@ -21,29 +21,31 @@ endi
print =============== create dnodes print =============== create dnodes
sql create dnode $hostname port 7200 sql create dnode $hostname port 7200
sql create dnode $hostname port 7300 $x = 0
sleep 2000 step1:
$x = $x + 1
sql show dnodes; sleep 500
if $rows != 3 then if $x == 20 then
return -1 return -1
endi
sql show dnodes -x step1
if $data(1)[4] != ready then
goto step1
endi endi
if $data(2)[4] != ready then
sql show mnodes; goto step1
if $rows != 1 then
return -1
endi
if $data00 != 1 then
return -1
endi
if $data02 != LEADER then
return -1
endi endi
print =============== create mnode 2 print =============== create mnode 2
sql create mnode on dnode 2 sql create mnode on dnode 2
$x = 0
step1:
$x = $x + 1
sleep 1000
if $x == 20 then
return -1
endi
sql show mnodes sql show mnodes
print $data(1)[0] $data(1)[1] $data(1)[2] print $data(1)[0] $data(1)[1] $data(1)[2]
print $data(2)[0] $data(2)[1] $data(2)[2] print $data(2)[0] $data(2)[1] $data(2)[2]
@ -60,8 +62,8 @@ endi
if $data(2)[0] != 2 then if $data(2)[0] != 2 then
return -1 return -1
endi endi
if $data(2)[2] == LEADER then if $data(2)[2] != FOLLOWER then
return -1 goto step1
endi endi
print =============== create user print =============== create user
@ -71,45 +73,47 @@ if $rows != 2 then
return -1 return -1
endi endi
#sql create database db sql create database db
#sql show databases sql show databases
#if $rows != 3 then if $rows != 3 then
# return -1 return -1
#endi endi
sleep 5000 sleep 5000
print =============== restart
system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode1 -s stop
system sh/exec.sh -n dnode2 -s stop system sh/exec.sh -n dnode2 -s stop
sleep 100
return
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode2 -s start system sh/exec.sh -n dnode2 -s start
sql connect sql connect
sql show mnodes sql show mnodes
if $rows != 2 then if $rows != 2 then
return -1 return -1
endi endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
return -1
endi
sql show users sql show users
if $rows != 2 then if $rows != 2 then
return -1 return -1
endi endi
#sql show databases sql show databases
#if $rows != 3 then if $rows != 3 then
# return -1 return -1
#endi endi
return sql show dnodes
if $data(1)[4] != ready then
return -1
endi
if $data(2)[4] != ready then
return -1
endi
print =============== insert data
sql create table db.stb (ts timestamp, i int) tags (j int)
sql create table db.ctb using db.stb tags(1);
system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode1 -s stop
system sh/exec.sh -n dnode2 -s stop system sh/exec.sh -n dnode2 -s stop

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

@ -15,11 +15,10 @@ $x = 0
step1: step1:
$x = $x + 1 $x = $x + 1
sleep 1000 sleep 1000
if $x == 10 then if $x == 20 then
return -1 return -1
endi endi
sql show dnodes -x step1
sql show dnodes
if $data(1)[4] != ready then if $data(1)[4] != ready then
goto step1 goto step1
endi endi
@ -38,15 +37,10 @@ $x = 0
step2: step2:
$x = $x + 1 $x = $x + 1
sleep 1000 sleep 1000
if $x == 10 then if $x == 20 then
return -1 return -1
endi endi
sql show mnodes -x step2
sql show mnodes
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(1)[2] != LEADER then if $data(1)[2] != LEADER then
goto step2 goto step2
endi endi
@ -64,44 +58,80 @@ if $rows != 2 then
return -1 return -1
endi endi
# wait mnode2 mnode3 recv data finish
sleep 10000 sleep 10000
print =============== step4: stop dnode1 print =============== step4: stop dnode1
system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode1 -s stop
$x = 0
return step4:
system sh/exec.sh -n dnode2 -s stop $x = $x + 1
sleep 100 sleep 1000
return if $x == 20 then
system sh/exec.sh -n dnode1 -s start return -1
system sh/exec.sh -n dnode2 -s start endi
sql show mnodes -x step4
sleep 10000 print $data(1)[0] $data(1)[1] $data(1)[2]
sql connect print $data(2)[0] $data(2)[1] $data(2)[2]
print $data(3)[0] $data(3)[1] $data(3)[2]
sql show mnodes
if $rows != 2 then
return -1
endi
if $data(1)[0] != 1 then
return -1
endi
if $data(1)[2] != LEADER then
return -1
endi
sql show users sql show users
if $rows != 2 then if $rows != 2 then
return -1 return -1
endi endi
#sql show databases sleep 1000
#if $rows != 3 then sql show dnodes
# return -1 if $data(2)[4] != ready then
#endi return -1
endi
if $data(3)[4] != ready then
return -1
endi
return print =============== step5: stop dnode1
system sh/exec.sh -n dnode1 -s start
system sh/exec.sh -n dnode2 -s stop
$x = 0
step5:
$x = $x + 1
sleep 1000
if $x == 20 then
return -1
endi
sql show mnodes -x step5
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]
sql show users
if $rows != 2 then
return -1
endi
print =============== step6: stop dnode1
system sh/exec.sh -n dnode2 -s start
system sh/exec.sh -n dnode3 -s stop
$x = 0
step6:
$x = $x + 1
sleep 1000
if $x == 20 then
return -1
endi
sql show mnodes -x step6
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]
sql show users
if $rows != 2 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode1 -s stop
system sh/exec.sh -n dnode2 -s stop system sh/exec.sh -n dnode2 -s stop
system sh/exec.sh -n dnode3 -s stop