From 401c31a623f094eadbb6144bd73b718c771795b0 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 29 Sep 2020 15:29:34 +0800 Subject: [PATCH] [td-225]update the log and fix a query crash. --- src/rpc/src/tudp.c | 8 ++++---- src/system/detail/src/vnodeQueryImpl.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/rpc/src/tudp.c diff --git a/src/rpc/src/tudp.c b/src/rpc/src/tudp.c old mode 100644 new mode 100755 index 2de42e2359..d707a199e7 --- a/src/rpc/src/tudp.c +++ b/src/rpc/src/tudp.c @@ -124,9 +124,9 @@ void taosProcessMonitorTimer(void *param, void *tmrId) { char *data = malloc((size_t)pMonitor->dataLen); memcpy(data, pMonitor->data, (size_t)pMonitor->dataLen); - tTrace("%s monitor timer is expired, update the link status", pSet->label); + tTrace("%s monitor timer is expired, update the link status, pConn:%p", pSet->label, pMonitor->pConn); (*pSet->fp)(data, pMonitor->dataLen, pMonitor->ip, 0, pSet->shandle, NULL, NULL); - taosTmrReset(taosProcessMonitorTimer, 200, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer); + taosTmrReset(taosProcessMonitorTimer, 100, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer); } else { taosTmrStopA(&pMonitor->pTimer); free(pMonitor); @@ -196,8 +196,8 @@ int taosReceivePacketViaTcp(uint32_t ip, STaosHeader *pHead, SUdpConn *pConn) { pthread_attr_t thattr; pthread_t thread; - tTrace("%s receive packet via TCP, handle:0x%x, source:0x%08x dest:0x%08x tranId:%d", pSet->label, pInfo->handle, - pHead->sourceId, pHead->destId, pHead->tranId); + tTrace("%s receive packet via TCP, handle:0x%x, source:0x%08x dest:0x%08x tranId:%d, pConn:%p", pSet->label, pInfo->handle, + pHead->sourceId, pHead->destId, pHead->tranId, pConn); SMonitor *pMonitor = (SMonitor *)calloc(1, sizeof(SMonitor)); pMonitor->dataLen = sizeof(STaosHeader) + sizeof(SPacketInfo); diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c index 94a54a4707..df7e8413f6 100644 --- a/src/system/detail/src/vnodeQueryImpl.c +++ b/src/system/detail/src/vnodeQueryImpl.c @@ -7142,6 +7142,7 @@ int32_t getDataBlocksForMeters(STableQuerySupportObj *pSupporter, SQuery *pQuery // sequentially scan this header file to extract the compHeader info for (int32_t j = 0; j < numOfMeters; ++j) { SMeterObj *pMeterObj = pMeterDataInfo[j]->pMeterObj; + pMeterDataInfo[j]->numOfBlocks = 0; lseek(pVnodeFileInfo->headerFd, pMeterDataInfo[j]->offsetInHeaderFile, SEEK_SET); @@ -7345,7 +7346,7 @@ int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMet dTrace("QInfo %p create data blocks info struct completed", addr); - assert(cnt == numOfCompBlocks && numOfQualMeters <= numOfMeters); // the pMeterDataInfo[j]->numOfBlocks may be 0 + assert(cnt <= numOfCompBlocks && numOfQualMeters <= numOfMeters); // the pMeterDataInfo[j]->numOfBlocks may be 0 supporter.numOfMeters = numOfQualMeters; SLoserTreeInfo *pTree = NULL; -- GitLab