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

Merge branch 'develop' into enhance/TD-2263

This commit is contained in:
stephenkgu 2020-12-02 01:14:30 +00:00
parent 8072b26a2f 001e09a822
commit 2553ae59f3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mnode/src/mnodeMain.c
View File

@ -55,7 +55,6 @@ typedef struct {
} SMnodeComponent; } SMnodeComponent;
void *tsMnodeTmr = NULL; void *tsMnodeTmr = NULL;
static bool tsMgmtIsRunning = false;
static EMndStatus tsMgmtStatus = TSDB_MND_STATUS_NOT_RUNNING; static EMndStatus tsMgmtStatus = TSDB_MND_STATUS_NOT_RUNNING;
static const SMnodeComponent tsMnodeComponents[] = { static const SMnodeComponent tsMnodeComponents[] = {
@ -139,7 +138,7 @@ int32_t mnodeInitSystem() {
} }
void mnodeCleanupSystem() { void mnodeCleanupSystem() {
if (tsMgmtIsRunning) { if (mnodeIsRunning()) {
mInfo("starting to clean up mnode"); mInfo("starting to clean up mnode");
tsMgmtStatus = TSDB_MND_STATUS_CLEANING; tsMgmtStatus = TSDB_MND_STATUS_CLEANING;

17
src/rpc/src/rpcMain.c
View File

@ -1559,13 +1559,18 @@ static int rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen) {
if ( !rpcIsReq(pHead->msgType) ) { if ( !rpcIsReq(pHead->msgType) ) {
// for response, if code is auth failure, it shall bypass the auth process // for response, if code is auth failure, it shall bypass the auth process
code = htonl(pHead->code); code = htonl(pHead->code);
if (code != 0) { #if 0
// tTrace("%s, dont check authentication since code is:0x%x", pConn->info, code); if (code != 0) {
pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen); #else
return 0; if (code == TSDB_CODE_RPC_INVALID_TIME_STAMP || code == TSDB_CODE_RPC_AUTH_FAILURE ||
} code == TSDB_CODE_RPC_AUTH_REQUIRED || code == TSDB_CODE_MND_INVALID_USER || code == TSDB_CODE_RPC_NOT_READY) {
#endif
// tTrace("%s, dont check authentication since code is:0x%x", pConn->info, code);
pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
return 0;
} }
}
code = 0; code = 0;
if (pHead->spi == pConn->spi) { if (pHead->spi == pConn->spi) {
// authentication // authentication