fix(rpc): fix unit test
This commit is contained in:
parent
8d03ff6f9b
commit
676a9b87f1
|
@ -30,8 +30,15 @@ int32_t MndTestProfile::connId;
|
||||||
TEST_F(MndTestProfile, 01_ConnectMsg) {
|
TEST_F(MndTestProfile, 01_ConnectMsg) {
|
||||||
SConnectReq connectReq = {0};
|
SConnectReq connectReq = {0};
|
||||||
connectReq.pid = 1234;
|
connectReq.pid = 1234;
|
||||||
|
|
||||||
|
char passwd[] = "taosdata";
|
||||||
|
char secretEncrypt[TSDB_PASSWORD_LEN] = {0};
|
||||||
|
taosEncryptPass_c((uint8_t*)passwd, strlen(passwd), secretEncrypt);
|
||||||
|
|
||||||
strcpy(connectReq.app, "mnode_test_profile");
|
strcpy(connectReq.app, "mnode_test_profile");
|
||||||
strcpy(connectReq.db, "");
|
strcpy(connectReq.db, "");
|
||||||
|
strcpy(connectReq.user, "root");
|
||||||
|
strcpy(connectReq.passwd, secretEncrypt);
|
||||||
|
|
||||||
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
||||||
void* pReq = rpcMallocCont(contLen);
|
void* pReq = rpcMallocCont(contLen);
|
||||||
|
@ -58,10 +65,16 @@ TEST_F(MndTestProfile, 01_ConnectMsg) {
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(MndTestProfile, 02_ConnectMsg_InvalidDB) {
|
TEST_F(MndTestProfile, 02_ConnectMsg_InvalidDB) {
|
||||||
|
char passwd[] = "taosdata";
|
||||||
|
char secretEncrypt[TSDB_PASSWORD_LEN] = {0};
|
||||||
|
taosEncryptPass_c((uint8_t*)passwd, strlen(passwd), secretEncrypt);
|
||||||
|
|
||||||
SConnectReq connectReq = {0};
|
SConnectReq connectReq = {0};
|
||||||
connectReq.pid = 1234;
|
connectReq.pid = 1234;
|
||||||
strcpy(connectReq.app, "mnode_test_profile");
|
strcpy(connectReq.app, "mnode_test_profile");
|
||||||
strcpy(connectReq.db, "invalid_db");
|
strcpy(connectReq.db, "invalid_db");
|
||||||
|
strcpy(connectReq.user, "root");
|
||||||
|
strcpy(connectReq.passwd, secretEncrypt);
|
||||||
|
|
||||||
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
||||||
void* pReq = rpcMallocCont(contLen);
|
void* pReq = rpcMallocCont(contLen);
|
||||||
|
|
|
@ -54,10 +54,16 @@ TEST_F(MndTestShow, 02_ShowMsg_InvalidMsgStart) {
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(MndTestShow, 03_ShowMsg_Conn) {
|
TEST_F(MndTestShow, 03_ShowMsg_Conn) {
|
||||||
|
char passwd[] = "taosdata";
|
||||||
|
char secretEncrypt[TSDB_PASSWORD_LEN] = {0};
|
||||||
|
taosEncryptPass_c((uint8_t*)passwd, strlen(passwd), secretEncrypt);
|
||||||
|
|
||||||
SConnectReq connectReq = {0};
|
SConnectReq connectReq = {0};
|
||||||
connectReq.pid = 1234;
|
connectReq.pid = 1234;
|
||||||
strcpy(connectReq.app, "mnode_test_show");
|
strcpy(connectReq.app, "mnode_test_show");
|
||||||
strcpy(connectReq.db, "");
|
strcpy(connectReq.db, "");
|
||||||
|
strcpy(connectReq.user, "root");
|
||||||
|
strcpy(connectReq.passwd, secretEncrypt);
|
||||||
|
|
||||||
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
int32_t contLen = tSerializeSConnectReq(NULL, 0, &connectReq);
|
||||||
void* pReq = rpcMallocCont(contLen);
|
void* pReq = rpcMallocCont(contLen);
|
||||||
|
@ -74,4 +80,4 @@ TEST_F(MndTestShow, 03_ShowMsg_Conn) {
|
||||||
TEST_F(MndTestShow, 04_ShowMsg_Cluster) {
|
TEST_F(MndTestShow, 04_ShowMsg_Cluster) {
|
||||||
test.SendShowReq(TSDB_MGMT_TABLE_CLUSTER, "cluster", "");
|
test.SendShowReq(TSDB_MGMT_TABLE_CLUSTER, "cluster", "");
|
||||||
EXPECT_EQ(test.GetShowRows(), 1);
|
EXPECT_EQ(test.GetShowRows(), 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,6 +103,13 @@ static void uvOnConnectionCb(uv_stream_t* q, ssize_t nread, const uv_buf_t* buf)
|
||||||
static void uvWorkerAsyncCb(uv_async_t* handle);
|
static void uvWorkerAsyncCb(uv_async_t* handle);
|
||||||
static void uvAcceptAsyncCb(uv_async_t* handle);
|
static void uvAcceptAsyncCb(uv_async_t* handle);
|
||||||
static void uvShutDownCb(uv_shutdown_t* req, int status);
|
static void uvShutDownCb(uv_shutdown_t* req, int status);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* time-consuming task throwed into BG work thread
|
||||||
|
*/
|
||||||
|
static void uvWorkDoTask(uv_work_t* req);
|
||||||
|
static void uvWorkAfterTask(uv_work_t* req, int status);
|
||||||
|
|
||||||
static void uvWalkCb(uv_handle_t* handle, void* arg);
|
static void uvWalkCb(uv_handle_t* handle, void* arg);
|
||||||
static void uvFreeCb(uv_handle_t* handle);
|
static void uvFreeCb(uv_handle_t* handle);
|
||||||
|
|
||||||
|
@ -184,6 +191,13 @@ static void uvHandleReq(SSrvConn* pConn) {
|
||||||
pHead->msgLen = htonl(pHead->msgLen);
|
pHead->msgLen = htonl(pHead->msgLen);
|
||||||
memcpy(pConn->user, pHead->user, strlen(pHead->user));
|
memcpy(pConn->user, pHead->user, strlen(pHead->user));
|
||||||
|
|
||||||
|
// TODO(dengyihao): time-consuming task throwed into BG Thread
|
||||||
|
// uv_work_t* wreq = taosMemoryMalloc(sizeof(uv_work_t));
|
||||||
|
// wreq->data = pConn;
|
||||||
|
// uv_read_stop((uv_stream_t*)pConn->pTcp);
|
||||||
|
// transRefSrvHandle(pConn);
|
||||||
|
// uv_queue_work(((SWorkThrdObj*)pConn->hostThrd)->loop, wreq, uvWorkDoTask, uvWorkAfterTask);
|
||||||
|
|
||||||
CONN_SHOULD_RELEASE(pConn, pHead);
|
CONN_SHOULD_RELEASE(pConn, pHead);
|
||||||
|
|
||||||
STransMsg transMsg;
|
STransMsg transMsg;
|
||||||
|
@ -450,6 +464,24 @@ static void uvShutDownCb(uv_shutdown_t* req, int status) {
|
||||||
taosMemoryFree(req);
|
taosMemoryFree(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void uvWorkDoTask(uv_work_t* req) {
|
||||||
|
// doing time-consumeing task
|
||||||
|
// only auth conn currently, add more func later
|
||||||
|
tTrace("server conn %p start to be processed in BG Thread", req->data);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void uvWorkAfterTask(uv_work_t* req, int status) {
|
||||||
|
if (status != 0) {
|
||||||
|
tTrace("server conn %p failed to processed ", req->data);
|
||||||
|
}
|
||||||
|
// Done time-consumeing task
|
||||||
|
// add more func later
|
||||||
|
// this func called in main loop
|
||||||
|
tTrace("server conn %p already processed ", req->data);
|
||||||
|
taosMemoryFree(req);
|
||||||
|
}
|
||||||
|
|
||||||
void uvOnAcceptCb(uv_stream_t* stream, int status) {
|
void uvOnAcceptCb(uv_stream_t* stream, int status) {
|
||||||
if (status == -1) {
|
if (status == -1) {
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue