From b7f6d152f86431da4f1a0841778a463783bbedd1 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 27 Dec 2022 14:14:18 +0800 Subject: [PATCH 1/2] fix: display the correct log information --- source/common/src/tglobal.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 9caf0cc33e..ad89428d07 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -1316,12 +1316,17 @@ void taosSetDebugFlag(int32_t *pFlagPtr, const char *flagName, int32_t flagVal, if (pItem != NULL && (rewrite || pItem->i32 == 0)) { pItem->i32 = flagVal; } - *pFlagPtr = flagVal; + if (pFlagPtr != NULL) { + *pFlagPtr = flagVal; + } } void taosSetAllDebugFlag(int32_t flag, bool rewrite) { if (flag <= 0) return; + taosSetDebugFlag(NULL, "debugFlag", flag, rewrite); + taosSetDebugFlag(NULL, "simDebugFlag", flag, rewrite); + taosSetDebugFlag(NULL, "tmrDebugFlag", flag, rewrite); taosSetDebugFlag(&uDebugFlag, "uDebugFlag", flag, rewrite); taosSetDebugFlag(&rpcDebugFlag, "rpcDebugFlag", flag, rewrite); taosSetDebugFlag(&jniDebugFlag, "jniDebugFlag", flag, rewrite); @@ -1333,6 +1338,7 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite) { taosSetDebugFlag(&wDebugFlag, "wDebugFlag", flag, rewrite); taosSetDebugFlag(&sDebugFlag, "sDebugFlag", flag, rewrite); taosSetDebugFlag(&tsdbDebugFlag, "tsdbDebugFlag", flag, rewrite); + taosSetDebugFlag(&tsdbDebugFlag, "tsdbDebugFlag", flag, rewrite); taosSetDebugFlag(&tqDebugFlag, "tqDebugFlag", flag, rewrite); taosSetDebugFlag(&fsDebugFlag, "fsDebugFlag", flag, rewrite); taosSetDebugFlag(&udfDebugFlag, "udfDebugFlag", flag, rewrite); @@ -1340,6 +1346,5 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite) { taosSetDebugFlag(&idxDebugFlag, "idxDebugFlag", flag, rewrite); taosSetDebugFlag(&tdbDebugFlag, "tdbDebugFlag", flag, rewrite); taosSetDebugFlag(&metaDebugFlag, "metaDebugFlag", flag, rewrite); - taosSetDebugFlag(&metaDebugFlag, "tmrDebugFlag", flag, rewrite); uInfo("all debug flag are set to %d", flag); } From 861493010ea689b790defe795b376c619f2f00f1 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 27 Dec 2022 14:15:20 +0800 Subject: [PATCH 2/2] fix: display the correct log information --- source/common/src/tglobal.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index ad89428d07..d3fd625a91 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -1338,7 +1338,6 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite) { taosSetDebugFlag(&wDebugFlag, "wDebugFlag", flag, rewrite); taosSetDebugFlag(&sDebugFlag, "sDebugFlag", flag, rewrite); taosSetDebugFlag(&tsdbDebugFlag, "tsdbDebugFlag", flag, rewrite); - taosSetDebugFlag(&tsdbDebugFlag, "tsdbDebugFlag", flag, rewrite); taosSetDebugFlag(&tqDebugFlag, "tqDebugFlag", flag, rewrite); taosSetDebugFlag(&fsDebugFlag, "fsDebugFlag", flag, rewrite); taosSetDebugFlag(&udfDebugFlag, "udfDebugFlag", flag, rewrite);