diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 48c70c652b3bbdade884b354d82bd9dcbe0e96bf..0898d3201880abf504a4e73c3e652f3a6e1c8b69 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -82,7 +82,7 @@ extern int64_t tsVndCommitMaxIntervalMs; // mnode extern int64_t tsMndSdbWriteDelta; extern int64_t tsMndLogRetention; -extern int8_t tsExpired; +extern int8_t tsGrant; // monitor extern bool tsEnableMonitor; @@ -198,7 +198,7 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite); void taosSetDebugFlag(int32_t *pFlagPtr, const char *flagName, int32_t flagVal, bool rewrite); int32_t taosApplyLocalCfg(SConfig *pCfg, char *name); void taosLocalCfgForbiddenToChange(char *name, bool *forbidden); -int8_t taosExpired(); +int8_t taosGranted(); #ifdef __cplusplus } diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 7befe6c6561beea4a9c7032d15ce852b03927f28..42f082ac82d41993ca0b8af85a14461636242cc6 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -74,7 +74,7 @@ int64_t tsVndCommitMaxIntervalMs = 600 * 1000; // mnode int64_t tsMndSdbWriteDelta = 200; int64_t tsMndLogRetention = 2000; -int8_t tsExpired = 0; +int8_t tsGrant = 1; // monitor bool tsEnableMonitor = true; @@ -1525,4 +1525,4 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite) { uInfo("all debug flag are set to %d", flag); } -int8_t taosExpired() { return atomic_load_8(&tsExpired); } +int8_t taosGranted() { return atomic_load_8(&tsGrant); } diff --git a/source/libs/qworker/src/qwMsg.c b/source/libs/qworker/src/qwMsg.c index 753df685ad229a3121074e2abf825ea190d152d7..508e957e265d295b51db83aedb22ac92575bec9c 100644 --- a/source/libs/qworker/src/qwMsg.c +++ b/source/libs/qworker/src/qwMsg.c @@ -8,6 +8,7 @@ #include "tcommon.h" #include "tmsg.h" #include "tname.h" +#include "tgrant.h" int32_t qwMallocFetchRsp(int8_t rpcMalloc, int32_t length, SRetrieveTableRsp **rsp) { int32_t msgSize = sizeof(SRetrieveTableRsp) + length; @@ -365,7 +366,7 @@ int32_t qWorkerPreprocessQueryMsg(void *qWorkerMgmt, SRpcMsg *pMsg, bool chkGran QW_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT); } - if (chkGrant && (!TEST_SHOW_REWRITE_MASK(msg.msgMask)) && taosExpired()) { + if (chkGrant && (!TEST_SHOW_REWRITE_MASK(msg.msgMask)) && !taosGranted()) { QW_ELOG("query failed cause of grant expired, msgMask:%d", msg.msgMask); tFreeSSubQueryMsg(&msg); QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);