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

chore: code optimization for fs destroy

This commit is contained in:
Cary Xu 2022-09-23 17:27:48 +08:00
parent e792c66307
commit 797b9376e7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/vnode/src/inc/tsdb.h
View File

@ -322,6 +322,7 @@ struct STsdbFS {
struct STsdbTrimHdl { struct STsdbTrimHdl {
volatile int8_t state; // 0 idle 1 in use volatile int8_t state; // 0 idle 1 in use
volatile int8_t limitSpeed; // 0 no limit, 1 with limit
volatile int32_t maxRetentFid; volatile int32_t maxRetentFid;
volatile int32_t minCommitFid; volatile int32_t minCommitFid;
}; };

4
source/dnode/vnode/src/tsdb/tsdbFS.c
View File

@ -250,7 +250,7 @@ _err:
void tsdbFSDestroy(STsdbFS *pFS) { void tsdbFSDestroy(STsdbFS *pFS) {
if (pFS->pDelFile) { if (pFS->pDelFile) {
taosMemoryFree(pFS->pDelFile); taosMemoryFreeClear(pFS->pDelFile);
} }
for (int32_t iSet = 0; iSet < taosArrayGetSize(pFS->aDFileSet); iSet++) { for (int32_t iSet = 0; iSet < taosArrayGetSize(pFS->aDFileSet); iSet++) {
@ -263,7 +263,7 @@ void tsdbFSDestroy(STsdbFS *pFS) {
} }
} }
taosArrayDestroy(pFS->aDFileSet); pFS->aDFileSet = taosArrayDestroy(pFS->aDFileSet);
} }
static int32_t tsdbScanAndTryFixFS(STsdb *pTsdb) { static int32_t tsdbScanAndTryFixFS(STsdb *pTsdb) {

6
source/dnode/vnode/src/tsdb/tsdbRetention2.c
View File

@ -174,6 +174,8 @@ _migrate_loop:
// reset // reset
maxFid = INT32_MIN; maxFid = INT32_MIN;
fSize = 0; fSize = 0;
tsdbFSDestroy(&fs);
tsdbFSDestroy(&fsLatest);
code = tsdbFSCopy(pTsdb, &fs); code = tsdbFSCopy(pTsdb, &fs);
if (code) goto _exit; if (code) goto _exit;
@ -275,9 +277,9 @@ _merge_fs:
} }
taosThreadRwlockUnlock(&pTsdb->rwLock); taosThreadRwlockUnlock(&pTsdb->rwLock);
tsdbFSDestroy(&fs);
_exit: _exit:
tsdbFSDestroy(&fs);
tsdbFSDestroy(&fsLatest);
if (code != 0) { if (code != 0) {
tsdbError("vgId:%d, tsdb do retention(migrate) failed since %s", TD_VID(pTsdb->pVnode), tstrerror(code)); tsdbError("vgId:%d, tsdb do retention(migrate) failed since %s", TD_VID(pTsdb->pVnode), tstrerror(code));
ASSERT(0); ASSERT(0);