From 7ec31029e6fe34bca94385fa571e7f374d5d66c9 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Sep 2023 08:45:55 +0800 Subject: [PATCH 1/4] update test case --- source/dnode/mnode/impl/src/mndUser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 9ca4b24681..ce745ef94b 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -197,9 +197,9 @@ int64_t mndGetIpWhiteVer(SMnode *pMnode) { taosThreadRwlockUnlock(&ipWhiteMgt.rw); mInfo("ip-white-mnode ver: %" PRId64 "", ver); - // if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { - // return 0; - // } + if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { + return 0; + } return ver; } From da55d7e67eaf632d1de30b5bf8ee96fd2a0e477a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Sep 2023 09:25:23 +0800 Subject: [PATCH 2/4] update test case --- source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 4 ++-- source/dnode/mnode/impl/src/mndUser.c | 2 +- source/libs/transport/src/transSvr.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c index a7d6a79841..a4252db23d 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c @@ -31,10 +31,10 @@ static void dmUpdateDnodeCfg(SDnodeMgmt *pMgmt, SDnodeCfg *pCfg) { } } static void dmMayShouldUpdateIpWhiteList(SDnodeMgmt *pMgmt, int64_t ver) { - dInfo("ip-white-dnode ver: %" PRId64 ", status ver: %" PRId64 "", pMgmt->ipWhiteVer, ver); + dDebug("ip-white-list on dnode ver: %" PRId64 ", status ver: %" PRId64 "", pMgmt->ipWhiteVer, ver); if (pMgmt->ipWhiteVer == ver) { if (ver == 0) { - dInfo("disable ip-white-dnode ver: %" PRId64 ", status ver: %" PRId64 "", pMgmt->ipWhiteVer, ver); + dDebug("disable ip-white-list on dnode ver: %" PRId64 ", status ver: %" PRId64 "", pMgmt->ipWhiteVer, ver); rpcSetIpWhite(pMgmt->msgCb.serverRpc, NULL); pMgmt->ipWhiteVer = ver; } diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index ce745ef94b..86aa3d5715 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -195,7 +195,7 @@ int64_t mndGetIpWhiteVer(SMnode *pMnode) { } ver = ipWhiteMgt.ver; taosThreadRwlockUnlock(&ipWhiteMgt.rw); - mInfo("ip-white-mnode ver: %" PRId64 "", ver); + mDebug("ip-white-list on mnode ver: %" PRId64 "", ver); if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { return 0; diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index 923e7d475f..42675ffc91 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -96,8 +96,8 @@ typedef struct SWorkThrd { bool quit; SIpWhiteListTab* pWhiteList; - int64_t whiteListVer; - int8_t enableIpWhiteList; + int64_t whiteListVer; + int8_t enableIpWhiteList; } SWorkThrd; typedef struct SServerObj { @@ -121,12 +121,12 @@ typedef struct SServerObj { } SServerObj; SIpWhiteListTab* uvWhiteListCreate(); -void uvWhiteListDestroy(SIpWhiteListTab* pWhite); -void uvWhiteListAdd(SIpWhiteListTab* pWhite, char* user, SIpWhiteList* pList, int64_t ver); -void uvWhiteListUpdate(SIpWhiteListTab* pWhite, SHashObj* pTable); -bool uvWhiteListCheckConn(SIpWhiteListTab* pWhite, SSvrConn* pConn); -bool uvWhiteListFilte(SIpWhiteListTab* pWhite, char* user, uint32_t ip, int64_t ver); -void uvWhiteListSetConnVer(SIpWhiteListTab* pWhite, SSvrConn* pConn); +void uvWhiteListDestroy(SIpWhiteListTab* pWhite); +void uvWhiteListAdd(SIpWhiteListTab* pWhite, char* user, SIpWhiteList* pList, int64_t ver); +void uvWhiteListUpdate(SIpWhiteListTab* pWhite, SHashObj* pTable); +bool uvWhiteListCheckConn(SIpWhiteListTab* pWhite, SSvrConn* pConn); +bool uvWhiteListFilte(SIpWhiteListTab* pWhite, char* user, uint32_t ip, int64_t ver); +void uvWhiteListSetConnVer(SIpWhiteListTab* pWhite, SSvrConn* pConn); static void uvAllocConnBufferCb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf); static void uvAllocRecvBufferCb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf); @@ -263,7 +263,7 @@ void uvWhiteListDebug(SIpWhiteListTab* pWrite) { char* buf = NULL; uvWhiteListToStr(pUserList, user, &buf); - tDebug("white %s", buf); + tDebug("ip-white-list %s", buf); taosMemoryFree(buf); pIter = taosHashIterate(pWhiteList, pIter); } @@ -1568,7 +1568,7 @@ _return2: void transSetIpWhiteList(void* thandle, void* arg, FilteFunc* func) { STrans* pTransInst = (STrans*)transAcquireExHandle(transGetInstMgt(), (int64_t)thandle); - tInfo("update ip white list"); + tDebug("ip-white-list update on rpc"); SServerObj* svrObj = pTransInst->tcphandle; for (int i = 0; i < svrObj->numOfThreads; i++) { SWorkThrd* pThrd = svrObj->pThreadObj[i]; From 903c6280672e68744b62bf1410e205d792b40af0 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Sep 2023 12:18:04 +0800 Subject: [PATCH 3/4] update test case --- source/dnode/mnode/impl/src/mndUser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 86aa3d5715..0174aa16e1 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -616,7 +616,7 @@ SSdbRaw *mndUserActionEncode(SUserObj *pUser) { terrno = TSDB_CODE_OUT_OF_MEMORY; int32_t ipWhiteReserve = - pUser->pIpWhiteList ? (sizeof(SIpV4Range) * pUser->pIpWhiteList->num + sizeof(SIpWhiteList) + 4) : 4; + pUser->pIpWhiteList ? (sizeof(SIpV4Range) * pUser->pIpWhiteList->num + sizeof(SIpWhiteList) + 4) : 16; int32_t numOfReadDbs = taosHashGetSize(pUser->readDbs); int32_t numOfWriteDbs = taosHashGetSize(pUser->writeDbs); int32_t numOfReadStbs = taosHashGetSize(pUser->readTbs); @@ -1078,6 +1078,7 @@ static int32_t mndUserActionUpdate(SSdb *pSdb, SUserObj *pOld, SUserObj *pNew) { int32_t sz = sizeof(SIpWhiteList) + pNew->pIpWhiteList->num * sizeof(SIpV4Range); pOld->pIpWhiteList = taosMemoryRealloc(pOld->pIpWhiteList, sz); memcpy(pOld->pIpWhiteList, pNew->pIpWhiteList, sz); + pOld->ipWhiteListVer = pNew->ipWhiteListVer; taosWUnLockLatch(&pOld->lock); From aa1cc01064fdb446b4736d218d59ed7f6049cc8a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Sep 2023 12:18:43 +0800 Subject: [PATCH 4/4] update test case --- source/dnode/mnode/impl/src/mndUser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index 0174aa16e1..2e4698c665 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -197,9 +197,9 @@ int64_t mndGetIpWhiteVer(SMnode *pMnode) { taosThreadRwlockUnlock(&ipWhiteMgt.rw); mDebug("ip-white-list on mnode ver: %" PRId64 "", ver); - if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { - return 0; - } + // if (mndEnableIpWhiteList(pMnode) == 0 || tsEnableWhiteList == false) { + // return 0; + // } return ver; }