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

reduce to 30s for long query

This commit is contained in:
AlexDuan 2021-08-28 12:25:51 +08:00
parent ca43acde1e
commit 27f9f9e435
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/query/src/queryMain.c
View File

@ -240,7 +240,7 @@ int waitMoment(SQInfo* pQInfo){
} }
} }
if(ms == 0) return 0; if(ms == 0) return 0;
qWarn("wait sleep %dms. sql=%s", ms, pQInfo->sql); printf("test wait sleep %dms. sql=%s ...\n", ms, pQInfo->sql);
if(ms < 1000) { if(ms < 1000) {
taosMsleep(ms); taosMsleep(ms);
@ -250,7 +250,7 @@ int waitMoment(SQInfo* pQInfo){
taosMsleep(1000); taosMsleep(1000);
used_ms += 1000; used_ms += 1000;
if(isQueryKilled(pQInfo)){ if(isQueryKilled(pQInfo)){
qWarn("check query is canceled, sleep break... %s", pQInfo->sql); printf("test check query is canceled, sleep break.%s\n", pQInfo->sql);
break; break;
} }
} }
@ -753,9 +753,16 @@ bool qFixedNoBlock(void* pRepo, void* pMgmt, int32_t longQueryMs) {
//solve tsdb no block to commit //solve tsdb no block to commit
bool qSolveCommitNoBlock(void* pRepo, void* pMgmt) { bool qSolveCommitNoBlock(void* pRepo, void* pMgmt) {
qWarn("pRepo=%p start solve no block problem.", pRepo); qWarn("pRepo=%p start solve problem.", pRepo);
if(qFixedNoBlock(pRepo, pMgmt, 10*60*1000)) { if(qFixedNoBlock(pRepo, pMgmt, 10*60*1000)) {
return true; return true;
} }
return qFixedNoBlock(pRepo, pMgmt, 2*60*1000); if(qFixedNoBlock(pRepo, pMgmt, 2*60*1000)){
return true;
}
if(qFixedNoBlock(pRepo, pMgmt, 30*1000)){
return true;
}
qWarn("pRepo=%p solve problem failed.", pRepo);
return false;
} }

7
src/tsdb/src/tsdbBuffer.c
View File

@ -121,7 +121,7 @@ SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
if(tsDeadLockKillQuery) { if(tsDeadLockKillQuery) {
// supply new Block // supply new Block
if(tsdbInsertNewBlock(pRepo) > 0) { if(tsdbInsertNewBlock(pRepo) > 0) {
tsdbWarn("vgId:%d add new elastic block . elasticBlocks=%d totalBlocks=%d", REPO_ID(pRepo), pBufPool->nElasticBlocks, pBufPool->nBufBlocks); tsdbWarn("vgId:%d add new elastic block . elasticBlocks=%d cur free Blocks=%d", REPO_ID(pRepo), pBufPool->nElasticBlocks, pBufPool->bufBlockList->numOfEles);
break; break;
} else { } else {
// no newBlock, kill query free // no newBlock, kill query free
@ -205,7 +205,10 @@ void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode, bool bELastic
tsdbFreeBufBlock(pBufBlock); tsdbFreeBufBlock(pBufBlock);
free(pNode); free(pNode);
if(bELastic) if(bELastic)
pPool->nElasticBlocks--; {
pPool->nElasticBlocks--;
tsdbWarn("pPool=%p elastic block reduce one . nElasticBlocks=%d cur free Blocks=%d", pPool, pPool->nElasticBlocks, pPool->bufBlockList->numOfEles);
}
else else
pPool->nBufBlocks--; pPool->nBufBlocks--;
} }

2
src/tsdb/src/tsdbMemTable.c
View File

@ -106,7 +106,7 @@ int tsdbUnRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
tsdbRecycleBufferBlock(pBufPool, pNode, false); tsdbRecycleBufferBlock(pBufPool, pNode, false);
pBufPool->nRecycleBlocks -= 1; pBufPool->nRecycleBlocks -= 1;
} else { } else {
if(pBufPool->nElasticBlocks > 0 && listNEles(pBufPool->bufBlockList) > 0) { if(pBufPool->nElasticBlocks > 0 && listNEles(pBufPool->bufBlockList) > 2) {
tsdbRecycleBufferBlock(pBufPool, pNode, true); tsdbRecycleBufferBlock(pBufPool, pNode, true);
} else { } else {
tdListAppendNode(pBufPool->bufBlockList, pNode); tdListAppendNode(pBufPool->bufBlockList, pNode);