From 86c2944ed9736cbe339106941697bf5c47a69ee0 Mon Sep 17 00:00:00 2001 From: dmchen Date: Wed, 18 Sep 2024 09:44:27 +0000 Subject: [PATCH] enh/TD-31977-monitor-qid-qid-format-set-dnodeid-when-first-start --- include/libs/audit/audit.h | 2 +- include/libs/monitor/monitor.h | 2 +- source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 4 ++++ source/dnode/mgmt/node_mgmt/src/dmNodes.c | 4 ++-- source/libs/audit/src/auditMain.c | 2 +- source/libs/monitor/src/monFramework.c | 2 +- source/libs/monitor/src/monMain.c | 8 ++++---- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/libs/audit/audit.h b/include/libs/audit/audit.h index 1af8093fcf..2e786ab2b3 100644 --- a/include/libs/audit/audit.h +++ b/include/libs/audit/audit.h @@ -49,7 +49,7 @@ typedef struct { } SAuditRecord; int32_t auditInit(const SAuditCfg *pCfg); -void auditOpen(int32_t dnodeId); +void auditSetDnodeId(int32_t dnodeId); void auditCleanup(); int32_t auditSend(SJson *pJson); void auditRecord(SRpcMsg *pReq, int64_t clusterId, char *operation, char *target1, char *target2, diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h index b64cf223be..636e7a3143 100644 --- a/include/libs/monitor/monitor.h +++ b/include/libs/monitor/monitor.h @@ -218,7 +218,7 @@ typedef struct { } SDmNotifyHandle; int32_t monInit(const SMonCfg *pCfg); -void monOpen(int32_t dnodeId); +void monSetDnodeId(int32_t dnodeId); void monInitVnode(); void monCleanup(); void monRecordLog(int64_t ts, ELogLevel level, const char *content); diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c index 9c22a11674..61ffe334ed 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c @@ -14,7 +14,9 @@ */ #define _DEFAULT_SOURCE +#include "audit.h" #include "dmInt.h" +#include "monitor.h" #include "systable.h" #include "tchecksum.h" @@ -27,6 +29,8 @@ static void dmUpdateDnodeCfg(SDnodeMgmt *pMgmt, SDnodeCfg *pCfg) { (void)taosThreadRwlockWrlock(&pMgmt->pData->lock); pMgmt->pData->dnodeId = pCfg->dnodeId; pMgmt->pData->clusterId = pCfg->clusterId; + monSetDnodeId(pCfg->dnodeId); + auditSetDnodeId(pCfg->dnodeId); code = dmWriteEps(pMgmt->pData); if (code != 0) { dInfo("failed to set local info, dnodeId:%d clusterId:%" PRId64 " reason:%s", pCfg->dnodeId, pCfg->clusterId, diff --git a/source/dnode/mgmt/node_mgmt/src/dmNodes.c b/source/dnode/mgmt/node_mgmt/src/dmNodes.c index 84a6ba0399..f0f2410da2 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmNodes.c +++ b/source/dnode/mgmt/node_mgmt/src/dmNodes.c @@ -101,8 +101,8 @@ static int32_t dmOpenNodes(SDnode *pDnode) { } } - auditOpen(dmGetDnodeId(&pDnode->data)); - monOpen(dmGetDnodeId(&pDnode->data)); + auditSetDnodeId(dmGetDnodeId(&pDnode->data)); + monSetDnodeId(dmGetDnodeId(&pDnode->data)); dmSetStatus(pDnode, DND_STAT_RUNNING); return 0; diff --git a/source/libs/audit/src/auditMain.c b/source/libs/audit/src/auditMain.c index 2b1b0e648d..52a4c1c523 100644 --- a/source/libs/audit/src/auditMain.c +++ b/source/libs/audit/src/auditMain.c @@ -36,7 +36,7 @@ int32_t auditInit(const SAuditCfg *pCfg) { return taosThreadMutexInit(&tsAudit.lock, NULL); } -void auditOpen(int32_t dnodeId) { tsAudit.dnodeId = dnodeId; } +void auditSetDnodeId(int32_t dnodeId) { tsAudit.dnodeId = dnodeId; } static FORCE_INLINE void auditDeleteRecord(SAuditRecord * record) { if (record) { diff --git a/source/libs/monitor/src/monFramework.c b/source/libs/monitor/src/monFramework.c index 98de5eae57..76473ccbb1 100644 --- a/source/libs/monitor/src/monFramework.c +++ b/source/libs/monitor/src/monFramework.c @@ -768,7 +768,7 @@ void monSendPromReport() { if (pCont != NULL) { EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; char tmp[100] = {0}; - (void)sprintf(tmp, "%" PRId64, tGenQid64(tsMonitor.dnodeId)); + (void)sprintf(tmp, "0x%" PRIxLEAST64, tGenQid64(tsMonitor.dnodeId)); uDebug("report cont with QID:%s", tmp); if (taosSendHttpReportWithQID(tsMonitor.cfg.server, tsMonFwUri, tsMonitor.cfg.port, pCont, strlen(pCont), flag, tmp) != 0) { diff --git a/source/libs/monitor/src/monMain.c b/source/libs/monitor/src/monMain.c index c6357d9b75..4808ae0fdf 100644 --- a/source/libs/monitor/src/monMain.c +++ b/source/libs/monitor/src/monMain.c @@ -131,7 +131,7 @@ int32_t monInit(const SMonCfg *pCfg) { return 0; } -void monOpen(int32_t dnodeId) { tsMonitor.dnodeId = dnodeId; } +void monSetDnodeId(int32_t dnodeId) { tsMonitor.dnodeId = dnodeId; } void monInitVnode() { if (!tsEnableMonitor || tsMonitorFqdn[0] == 0 || tsMonitorPort == 0) return; @@ -602,7 +602,7 @@ void monSendReport(SMonInfo *pMonitor) { if (pCont != NULL) { EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; char tmp[100] = {0}; - (void)snprintf(tmp, 100, "%" PRId64, tGenQid64(tsMonitor.dnodeId)); + (void)snprintf(tmp, 100, "0x%" PRIxLEAST64, tGenQid64(tsMonitor.dnodeId)); uDebug("report cont with QID:%s", tmp); if (taosSendHttpReportWithQID(tsMonitor.cfg.server, tsMonUri, tsMonitor.cfg.port, pCont, strlen(pCont), flag, tmp) != 0) { @@ -624,7 +624,7 @@ void monSendReportBasic(SMonInfo *pMonitor) { if (pCont != NULL) { EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; char tmp[100] = {0}; - (void)sprintf(tmp, "%" PRId64, tGenQid64(tsMonitor.dnodeId)); + (void)sprintf(tmp, "0x%" PRIxLEAST64, tGenQid64(tsMonitor.dnodeId)); uDebug("report cont basic with QID:%s", tmp); if (taosSendHttpReportWithQID(tsMonitor.cfg.server, tsMonFwBasicUri, tsMonitor.cfg.port, pCont, strlen(pCont), flag, tmp) != 0) { @@ -679,7 +679,7 @@ void monSendContent(char *pCont, const char *uri) { } if (pCont != NULL) { char tmp[100] = {0}; - (void)sprintf(tmp, "%" PRId64, tGenQid64(tsMonitor.dnodeId)); + (void)sprintf(tmp, "0x%" PRIxLEAST64, tGenQid64(tsMonitor.dnodeId)); uInfoL("report client cont with QID:%s", tmp); EHttpCompFlag flag = tsMonitor.cfg.comp ? HTTP_GZIP : HTTP_FLAT; if (taosSendHttpReportWithQID(tsMonitor.cfg.server, uri, tsMonitor.cfg.port, pCont, strlen(pCont), flag, tmp) !=