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

Merge pull request #22162 from taosdata/fix/3_liaohj 

fix(stream): add some logs, and remove the invalid loop.
This commit is contained in:
Haojun Liao 2023-07-24 16:29:51 +08:00 committed by GitHub
parent dce1f579ea 9bae91bcba
commit d36903bf08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/dnode/vnode/src/tq/tq.c
View File

@ -1087,16 +1087,14 @@ int32_t tqProcessTaskScanHistory(STQ* pTq, SRpcMsg* pMsg) {
int64_t st = taosGetTimestampMs(); int64_t st = taosGetTimestampMs();
// we have to continue retrying to successfully execute the scan history task. // we have to continue retrying to successfully execute the scan history task.
while (1) { int8_t schedStatus = atomic_val_compare_exchange_8(&pTask->status.schedStatus, TASK_SCHED_STATUS__INACTIVE,
int8_t schedStatus = atomic_val_compare_exchange_8(&pTask->status.schedStatus, TASK_SCHED_STATUS__INACTIVE, TASK_SCHED_STATUS__WAITING);
TASK_SCHED_STATUS__WAITING); if (schedStatus != TASK_SCHED_STATUS__INACTIVE) {
if (schedStatus == TASK_SCHED_STATUS__INACTIVE) { tqError(
break; "s-task:%s failed to start scan-history in first stream time window since already started, unexpected "
} "sched-status:%d",
id, schedStatus);
tqError("s-task:%s failed to start scan history in current time window, unexpected sched-status:%d, retry in 100ms", return 0;
id, schedStatus);
taosMsleep(100);
} }
ASSERT(pTask->status.pauseAllowed == false); ASSERT(pTask->status.pauseAllowed == false);

3
source/libs/stream/src/streamExec.c
View File

@ -594,6 +594,9 @@ int32_t streamTryExec(SStreamTask* pTask) {
(!streamTaskShouldPause(&pTask->status))) { (!streamTaskShouldPause(&pTask->status))) {
streamSchedExec(pTask); streamSchedExec(pTask);
} }
} else {
qDebug("s-task:%s already started to exec by other thread, status:%s, sched-status:%d", pTask->id.idStr,
streamGetTaskStatusStr(pTask->status.taskStatus), pTask->status.schedStatus);
} }
return 0; return 0;