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

fix stream snap deadlock

This commit is contained in:
yihaoDeng 2023-10-17 11:23:39 +08:00
parent b6005d6183
commit 77542cc461
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/stream/inc/streamBackendRocksdb.h
View File

@ -65,8 +65,8 @@ typedef struct {
rocksdb_compactionfilterfactory_t* filterFactory; rocksdb_compactionfilterfactory_t* filterFactory;
TdThreadMutex mutex; TdThreadMutex mutex;
char* idstr; char* idstr;
int64_t refId;
char* path; char* path;
int64_t refId;
int64_t chkpId; int64_t chkpId;
SArray* chkpSaved; SArray* chkpSaved;

7
source/libs/stream/src/streamMeta.c
View File

@ -237,8 +237,9 @@ void* streamMetaGetBackendByTaskKey(SStreamMeta* pMeta, char* key, int64_t chkpI
taosThreadMutexUnlock(&pMeta->backendMutex); taosThreadMutexUnlock(&pMeta->backendMutex);
return NULL; return NULL;
} }
int64_t tref = taosAddRef(taskDbWrapperId, pBackend);
*ref = taosAddRef(taskDbWrapperId, pBackend); *ref = tref;
((STaskDbWrapper*)pBackend)->refId = tref;
taosHashPut(pMeta->pTaskDbUnique, key, strlen(key), &pBackend, sizeof(void*)); taosHashPut(pMeta->pTaskDbUnique, key, strlen(key), &pBackend, sizeof(void*));
taosThreadMutexUnlock(&pMeta->backendMutex); taosThreadMutexUnlock(&pMeta->backendMutex);
@ -824,8 +825,6 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
taosArrayPush(pMeta->pTaskList, &pTask->id); taosArrayPush(pMeta->pTaskList, &pTask->id);
} else { } else {
tdbFree(pKey);
tdbFree(pVal);
taosMemoryFree(pTask); taosMemoryFree(pTask);
continue; continue;
} }