diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c index 53326396d7..1d05e54f07 100644 --- a/source/client/src/clientHb.c +++ b/source/client/src/clientHb.c @@ -105,10 +105,10 @@ static int32_t hbProcessUserPassInfoRsp(void *value, int32_t valueLen, SClientHb continue; } SPassInfo *passInfo = &pTscObj->passInfo; - // if (!passInfo->fp) { - // releaseTscObj(pReq->connKey.tscRid); - // continue; - // } + if (!passInfo->fp) { + releaseTscObj(pReq->connKey.tscRid); + continue; + } for (int32_t i = 0; i < numOfBatchs; ++i) { SGetUserPassRsp *rsp = taosArrayGet(batchRsp.pArray, i); @@ -119,7 +119,7 @@ static int32_t hbProcessUserPassInfoRsp(void *value, int32_t valueLen, SClientHb if (passInfo->fp) { (*passInfo->fp)(passInfo->param, &passInfo->ver, TAOS_NOTIFY_PASSVER); } - printf("update passVer of user %s from %d to %d, tscRid:%" PRIi64 "\n", rsp->user, oldVer, + tscDebug("update passVer of user %s from %d to %d, tscRid:%" PRIi64, rsp->user, oldVer, atomic_load_32(&passInfo->ver), pTscObj->id); } break; @@ -588,9 +588,9 @@ static int32_t hbGetUserBasicInfo(SClientHbKey *connKey, SHbParam *param, SClien if ((pKv = taosHashGet(req->info, &kv.key, sizeof(kv.key)))) { SUserPassVersion *pPassVer = (SUserPassVersion *)pKv->value; tscDebug("hb got user basic info, already exists:%s, update passVer from %d to %d", pTscObj->user, - pPassVer->version, pTscObj->passInfo.ver); - pPassVer->version = pTscObj->passInfo.ver; - if (param) param->passVer = pPassVer->version; + htonl(pPassVer->version), pTscObj->passInfo.ver); + pPassVer->version = htonl(pTscObj->passInfo.ver); + if (param) param->passVer = pTscObj->passInfo.ver; goto _return; } @@ -867,9 +867,9 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req hbGetQueryBasicInfo(connKey, req); - // if (hbParam->passKeyCnt > 0) { + if (hbParam->passKeyCnt > 0) { hbGetUserBasicInfo(connKey, hbParam, req); - // } + } if (hbParam->reqCnt == 0) { code = hbGetExpiredUserInfo(connKey, pCatalog, req); diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 29fcb804a5..efe180060f 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -1383,8 +1383,7 @@ int32_t mndValidateUserAuthInfo(SMnode *pMnode, SUserAuthVersion *pUsers, int32_ pUsers[i].version = ntohl(pUsers[i].version); if (pUser->authVersion <= pUsers[i].version) { - printf("%s:%d pUser->authVersion:%d <= pUsers[i].version:%d\n", __func__, __LINE__, pUser->authVersion, - pUsers[i].version); + mTrace("pUser->authVersion:%d <= pUsers[i].version:%d", pUser->authVersion, pUsers[i].version); mndReleaseUser(pMnode, pUser); continue; }