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

fix: force stop issue

This commit is contained in:
dapan1121 2024-12-06 17:35:32 +08:00
parent abbb0663b0
commit bcdcdd194a
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/libs/qworker/src/qwUtil.c
View File

@ -775,11 +775,13 @@ bool qwStopTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool forceStop, int32_t errC
QW_TASK_DLOG_E("task running, async killed"); QW_TASK_DLOG_E("task running, async killed");
} }
} else if (QW_FETCH_RUNNING(ctx)) { } else if (QW_FETCH_RUNNING(ctx)) {
QW_TASK_DLOG_E("task fetching");
QW_UPDATE_RSP_CODE(ctx, errCode); QW_UPDATE_RSP_CODE(ctx, errCode);
if (forceStop) {
QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_DROP); QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_DROP);
QW_TASK_DLOG_E("task fetching, update drop received"); QW_TASK_DLOG_E("update drop received");
// } else if (forceStop) { }
} else { } else if (forceStop) {
QW_UPDATE_RSP_CODE(ctx, errCode); QW_UPDATE_RSP_CODE(ctx, errCode);
code = qwDropTask(QW_FPARAMS()); code = qwDropTask(QW_FPARAMS());
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
@ -788,10 +790,8 @@ bool qwStopTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool forceStop, int32_t errC
QW_TASK_DLOG_E("task dropped"); QW_TASK_DLOG_E("task dropped");
resFreed = true; resFreed = true;
} }
/*
} else { } else {
QW_UPDATE_RSP_CODE(ctx, errCode); QW_UPDATE_RSP_CODE(ctx, errCode);
QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_DROP);
qwFreeTaskHandle(ctx); qwFreeTaskHandle(ctx);
qwFreeSinkHandle(ctx); qwFreeSinkHandle(ctx);
@ -799,7 +799,6 @@ bool qwStopTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool forceStop, int32_t errC
resFreed = true; resFreed = true;
QW_TASK_DLOG_E("task resources freed"); QW_TASK_DLOG_E("task resources freed");
*/
} }
QW_UNLOCK(QW_WRITE, &ctx->lock); QW_UNLOCK(QW_WRITE, &ctx->lock);
@ -871,7 +870,7 @@ void qwChkDropTimeoutQuery(SQWorker *mgmt, int32_t currTs) {
void *pIter = taosHashIterate(mgmt->ctxHash, NULL); void *pIter = taosHashIterate(mgmt->ctxHash, NULL);
while (pIter) { while (pIter) {
SQWTaskCtx *ctx = (SQWTaskCtx *)pIter; SQWTaskCtx *ctx = (SQWTaskCtx *)pIter;
if (((ctx->lastAckTs <= 0) || (currTs - ctx->lastAckTs) < tsQueryNoFetchTimeoutSec) && (!QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP))) { if (((ctx->lastAckTs <= 0) || (currTs - ctx->lastAckTs) < 60 /*tsQueryNoFetchTimeoutSec*/) && (!QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP))) {
pIter = taosHashIterate(mgmt->ctxHash, pIter); pIter = taosHashIterate(mgmt->ctxHash, pIter);
continue; continue;
} }

2
source/util/src/tmempool.c
View File

@ -1763,7 +1763,7 @@ int32_t taosMemoryPoolInit(mpReserveFailFp failFp, mpReserveReachFp reachFp) {
return code; return code;
} }
uInfo("memory pool initialized, reservedSize:%dMB, freeAfterReserved:%" PRId64 "MB", tsMinReservedMemorySize, freeSizeAfterRes/1048576UL); uInfo("memory pool initialized, reservedSize:%dMB, freeAfterReserved:%" PRId64 "MB, jobQuota:%dMB", tsMinReservedMemorySize, freeSizeAfterRes/1048576UL, tsSingleQueryMaxMemorySize);
return code; return code;
} }

2
source/util/test/memPoolTest.cpp
View File

@ -1588,7 +1588,7 @@ TEST(PerfTest, GetSysAvail) {
} }
#endif #endif
#if 1 #if 0
TEST(MiscTest, monSysAvailSize) { TEST(MiscTest, monSysAvailSize) {
char* caseName = "MiscTest:monSysAvailSize"; char* caseName = "MiscTest:monSysAvailSize";
int32_t code = 0; int32_t code = 0;