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

fix:[TD-33556] tmq close elegantly to avoid invalid read in TD-32585

This commit is contained in:
wangmm0220 2025-01-21 11:39:10 +08:00
parent 19f059212d
commit 650aca8e32
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/client/src/clientTmq.c
View File

@ -1617,10 +1617,6 @@ static void tmqMgmtInit(void) {
goto END; goto END;
} }
if (taosThreadMutexAttrSetType(&attr, PTHREAD_MUTEX_RECURSIVE) != 0){
goto END;
}
if (taosThreadMutexInit(&tmqMgmt.lock, &attr) != 0){ if (taosThreadMutexInit(&tmqMgmt.lock, &attr) != 0){
goto END; goto END;
} }
@ -2658,7 +2654,7 @@ int32_t tmq_unsubscribe(tmq_t* tmq) {
int32_t tmq_consumer_close(tmq_t* tmq) { int32_t tmq_consumer_close(tmq_t* tmq) {
if (tmq == NULL) return TSDB_CODE_INVALID_PARA; if (tmq == NULL) return TSDB_CODE_INVALID_PARA;
int32_t code = 0; int32_t code = 0;
(void) taosThreadMutexLock(&tmqMgmt.lock); code = taosThreadMutexLock(&tmqMgmt.lock);
if (atomic_load_8(&tmq->status) == TMQ_CONSUMER_STATUS__CLOSED){ if (atomic_load_8(&tmq->status) == TMQ_CONSUMER_STATUS__CLOSED){
goto end; goto end;
} }
@ -2673,7 +2669,7 @@ int32_t tmq_consumer_close(tmq_t* tmq) {
} }
end: end:
(void)taosThreadMutexLock(&tmqMgmt.lock); code = taosThreadMutexUnlock(&tmqMgmt.lock);
return code; return code;
} }