xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:[TS-4921] logic error

This commit is contained in:
wangmm0220 2024-06-22 14:26:20 +08:00
parent c5ef577b1b
commit 2475fe9fa6
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/client/src/clientMonitor.c
View File

@ -152,6 +152,7 @@ static int32_t sendReport(void* pTransporter, SEpSet *epSet, char* pCont, MONITO
void monitorReadSendSlowLog(TdFilePtr pFile, void* pTransporter, SEpSet *epSet){ void monitorReadSendSlowLog(TdFilePtr pFile, void* pTransporter, SEpSet *epSet){
char buf[SLOW_LOG_SEND_SIZE + 1] = {0}; // +1 for \0, for print log char buf[SLOW_LOG_SEND_SIZE + 1] = {0}; // +1 for \0, for print log
char pCont[SLOW_LOG_SEND_SIZE + 1] = {0}; // +1 for \0, for print log
int32_t offset = 0; int32_t offset = 0;
if(taosLSeekFile(pFile, 0, SEEK_SET) < 0){ if(taosLSeekFile(pFile, 0, SEEK_SET) < 0){
uError("failed to seek file:%p code: %d", pFile, errno); uError("failed to seek file:%p code: %d", pFile, errno);
@ -164,32 +165,28 @@ void monitorReadSendSlowLog(TdFilePtr pFile, void* pTransporter, SEpSet *epSet){
return; return;
} }
cJSON* pArray = cJSON_CreateArray(); memset(pCont, 0, sizeof(pCont));
strcat(pCont, "[");
char* string = buf; char* string = buf;
for(int i = 0; i < readSize + offset; i++){ for(int i = 0; i < readSize + offset; i++){
if (buf[i] == '\0') { if (buf[i] == '\0') {
cJSON_AddItemToArray(pArray, cJSON_CreateString(string)); if (string != buf) strcat(pCont, ",");
uDebug("[monitor] slow log:%s", string); strcat(pCont, string);
uDebug("[monitor] monitorReadSendSlowLog slow log:%s", string);
string = buf + i + 1; string = buf + i + 1;
} }
} }
strcat(pCont, "]");
ASSERT(cJSON_GetArraySize(pArray) > 0); // make sure SLOW_LOG_SEND_SIZE is bigger than one line in pFile
char* pCont = cJSON_PrintUnformatted(pArray);
if (pTransporter && pCont != NULL) { if (pTransporter && pCont != NULL) {
if(sendReport(pTransporter, epSet, pCont, MONITOR_TYPE_SLOW_LOG) != 0){ if(sendReport(pTransporter, epSet, pCont, MONITOR_TYPE_SLOW_LOG) != 0){
if(taosLSeekFile(pFile, -readSize, SEEK_CUR) < 0){ if(taosLSeekFile(pFile, -readSize, SEEK_CUR) < 0){
uError("failed to seek file:%p code: %d", pFile, errno); uError("failed to seek file:%p code: %d", pFile, errno);
} }
uError("failed to send report:%s", pCont); uError("failed to send report:%s", pCont);
cJSON_free(pCont);
cJSON_Delete(pArray);
return; return;
} }
uDebug("[monitor] send slow log:%s", pCont) uDebug("[monitor] monitorReadSendSlowLog send slow log to mnode:%s", pCont)
} }
cJSON_free(pCont);
cJSON_Delete(pArray);
if (readSize + offset < SLOW_LOG_SEND_SIZE) { if (readSize + offset < SLOW_LOG_SEND_SIZE) {
break; break;
@ -197,13 +194,13 @@ void monitorReadSendSlowLog(TdFilePtr pFile, void* pTransporter, SEpSet *epSet){
offset = SLOW_LOG_SEND_SIZE - (string - buf); offset = SLOW_LOG_SEND_SIZE - (string - buf);
if(buf != string && offset != 0){ if(buf != string && offset != 0){
memmove(buf, string, offset); memmove(buf, string, offset);
uDebug("[monitor] left slow log:%s", buf) uDebug("[monitor] monitorReadSendSlowLog left slow log:%s", buf)
} }
} }
if(taosFtruncateFile(pFile, 0) < 0){ if(taosFtruncateFile(pFile, 0) < 0){
uError("failed to truncate file:%p code: %d", pFile, errno); uError("failed to truncate file:%p code: %d", pFile, errno);
} }
uDebug("[monitor] send slow log file:%p", pFile); uDebug("[monitor] monitorReadSendSlowLog send slow log file:%p", pFile);
} }
static void generateClusterReport(taos_collector_registry_t* registry, void* pTransporter, SEpSet *epSet) { static void generateClusterReport(taos_collector_registry_t* registry, void* pTransporter, SEpSet *epSet) {
@ -253,6 +250,8 @@ static void sendAllSlowLog(){
} }
data = taosHashIterate(monitorSlowLogHash, data); data = taosHashIterate(monitorSlowLogHash, data);
} }
uDebug("[monitor] sendAllSlowLog when client close");
taosRUnLockLatch(&monitorLock); taosRUnLockLatch(&monitorLock);
} }
@ -296,7 +295,6 @@ void monitorSendAllSlowLogFromTempDir(void* inst){
char filename[PATH_MAX] = {0}; char filename[PATH_MAX] = {0};
snprintf(filename, sizeof(filename), "%s%s", tmpPath, name); snprintf(filename, sizeof(filename), "%s%s", tmpPath, name);
uDebug("[monitor] send slow log file:%s", filename);
TdFilePtr pFile = taosOpenFile(filename, TD_FILE_READ); TdFilePtr pFile = taosOpenFile(filename, TD_FILE_READ);
if (pFile == NULL) { if (pFile == NULL) {
uError("failed to open file:%s since %s", filename, terrstr()); uError("failed to open file:%s since %s", filename, terrstr());
@ -312,6 +310,8 @@ void monitorSendAllSlowLogFromTempDir(void* inst){
taosUnLockFile(pFile); taosUnLockFile(pFile);
taosCloseFile(&pFile); taosCloseFile(&pFile);
taosRemoveFile(filename); taosRemoveFile(filename);
uDebug("[monitor] send and delete slow log file when reveive connect rsp:%s", filename);
} }
taosCloseDir(&pDir); taosCloseDir(&pDir);

6
source/common/src/tglobal.c
View File

@ -181,6 +181,7 @@ int32_t tsMetaCacheMaxSize = -1; // MB
int32_t tsSlowLogThreshold = 10; // seconds int32_t tsSlowLogThreshold = 10; // seconds
int32_t tsSlowLogThresholdTest = 10; // seconds int32_t tsSlowLogThresholdTest = 10; // seconds
int32_t tsSlowLogScope = SLOW_LOG_TYPE_QUERY; int32_t tsSlowLogScope = SLOW_LOG_TYPE_QUERY;
char* tsSlowLogScopeString = "query";
int32_t tsSlowLogMaxLen = 4096; int32_t tsSlowLogMaxLen = 4096;
int32_t tsTimeSeriesThreshold = 50; int32_t tsTimeSeriesThreshold = 50;
bool tsMultiResultFunctionStarReturnTags = false; bool tsMultiResultFunctionStarReturnTags = false;
@ -700,7 +701,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if (cfgAddInt32(pCfg, "slowLogThresholdTest", tsSlowLogThresholdTest, 0, INT32_MAX, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "slowLogThresholdTest", tsSlowLogThresholdTest, 0, INT32_MAX, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
if (cfgAddInt32(pCfg, "slowLogThreshold", tsSlowLogThreshold, 1, INT32_MAX, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "slowLogThreshold", tsSlowLogThreshold, 1, INT32_MAX, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
if (cfgAddInt32(pCfg, "slowLogMaxLen", tsSlowLogMaxLen, 0, 16384, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "slowLogMaxLen", tsSlowLogMaxLen, 0, 16384, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
if (cfgAddString(pCfg, "slowLogScope", "", CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1; if (cfgAddString(pCfg, "slowLogScope", tsSlowLogScopeString, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1; if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1;
if (cfgAddInt32(pCfg, "monitorPort", tsMonitorPort, 1, 65056, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1; if (cfgAddInt32(pCfg, "monitorPort", tsMonitorPort, 1, 65056, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1;
@ -1437,8 +1438,7 @@ static int32_t taosCfgSetOption(OptionNameAndVar *pOptions, int32_t optionSize,
char *name = pItem->name; char *name = pItem->name;
for (int32_t d = 0; d < optionSize; ++d) { for (int32_t d = 0; d < optionSize; ++d) {
const char *optName = pOptions[d].optionName; const char *optName = pOptions[d].optionName;
int32_t optLen = strlen(optName); if (strcasecmp(name, optName) != 0) continue;
if (strncasecmp(name, optName, optLen) != 0) continue;
switch (pItem->dtype) { switch (pItem->dtype) {
case CFG_DTYPE_BOOL: { case CFG_DTYPE_BOOL: {
int32_t flag = pItem->i32; int32_t flag = pItem->i32;