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

fix(tools): network test in shell

This commit is contained in:
Shengliang Guan 2022-04-24 19:32:51 +08:00
parent d1ac98fa84
commit e827fbcf20
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/shell/src/shellNettest.c
View File

@ -52,9 +52,9 @@ static void shellWorkAsClient() {
pArgs->port = tsServerPort; pArgs->port = tsServerPort;
} }
printf("net test client is initialized, the server to connect to is %s:%u\n", fqdn, pArgs->port); printf("network test client is initialized, the server is %s:%u\n", fqdn, pArgs->port);
tstrncpy(epSet.eps[0].fqdn, pArgs->host, TSDB_FQDN_LEN); tstrncpy(epSet.eps[0].fqdn, fqdn, TSDB_FQDN_LEN);
epSet.eps[0].port = (uint16_t)pArgs->port; epSet.eps[0].port = (uint16_t)pArgs->port;
int32_t totalSucc = 0; int32_t totalSucc = 0;
@ -65,11 +65,14 @@ static void shellWorkAsClient() {
rpcMsg.pCont = rpcMallocCont(pArgs->pktLen); rpcMsg.pCont = rpcMallocCont(pArgs->pktLen);
rpcMsg.contLen = pArgs->pktLen; rpcMsg.contLen = pArgs->pktLen;
printf("net test request is sent, size:%d\n", rpcMsg.contLen); printf("request is sent, size:%d\n", rpcMsg.contLen);
rpcSendRecv(clientRpc, &epSet, &rpcMsg, &rpcRsp); rpcSendRecv(clientRpc, &epSet, &rpcMsg, &rpcRsp);
printf("net test response is received, size:%d\n", rpcMsg.contLen); if (rpcRsp.code == 0 &&rpcRsp.contLen == rpcMsg.contLen) {
printf("response is received, size:%d\n", rpcMsg.contLen);
if (rpcRsp.code == 0) totalSucc++; if (rpcRsp.code == 0) totalSucc++;
} else {
printf("response not received since %s\n", terrstr());
}
rpcFreeCont(rpcRsp.pCont); rpcFreeCont(rpcRsp.pCont);
rpcRsp.pCont = NULL; rpcRsp.pCont = NULL;
@ -91,7 +94,8 @@ _OVER:
} }
static void shellProcessMsg(void *p, SRpcMsg *pRpc, SEpSet *pEpSet) { static void shellProcessMsg(void *p, SRpcMsg *pRpc, SEpSet *pEpSet) {
printf("net test request is received, size:%d\n", pRpc->contLen); printf("request is received, size:%d\n", pRpc->contLen);
fflush(stdout);
SRpcMsg rsp = {.handle = pRpc->handle, .ahandle = pRpc->ahandle, .code = 0}; SRpcMsg rsp = {.handle = pRpc->handle, .ahandle = pRpc->ahandle, .code = 0};
rsp.pCont = rpcMallocCont(shell.args.pktLen); rsp.pCont = rpcMallocCont(shell.args.pktLen);
rsp.contLen = shell.args.pktLen; rsp.contLen = shell.args.pktLen;
@ -117,7 +121,11 @@ static void shellWorkAsServer() {
printf("failed to init net test server since %s", terrstr()); printf("failed to init net test server since %s", terrstr());
} }
printf("net test server is initialized, port:%u\n", pArgs->port); if (pArgs->port == 0) {
pArgs->port = tsServerPort;
}
printf("network test server is initialized, port:%u\n", pArgs->port);
taosSetSignal(SIGTERM, shellNettestHandler); taosSetSignal(SIGTERM, shellNettestHandler);
while (1) taosMsleep(10); while (1) taosMsleep(10);