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

Merge pull request #6364 from taosdata/feature/TD-1920 

[TD-1920]fix compact bug:sync sdb to disk when compact end
This commit is contained in:
Shengliang Guan 2021-06-03 21:10:01 +08:00 committed by GitHub
parent 188fa64069 f7190b2fdc
commit b70bcf30d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dnode/src/dnodeMain.c
View File

@ -95,11 +95,17 @@ static SStep tsDnodeCompactSteps[] = {
{"dnode-minfos", dnodeInitMInfos, dnodeCleanupMInfos}, {"dnode-minfos", dnodeInitMInfos, dnodeCleanupMInfos},
{"dnode-wal", walInit, walCleanUp}, {"dnode-wal", walInit, walCleanUp},
{"dnode-sync", syncInit, syncCleanUp}, {"dnode-sync", syncInit, syncCleanUp},
{"dnode-vread", dnodeInitVRead, dnodeCleanupVRead},
{"dnode-vwrite", dnodeInitVWrite, dnodeCleanupVWrite},
{"dnode-vmgmt", dnodeInitVMgmt, dnodeCleanupVMgmt},
{"dnode-mread", dnodeInitMRead, NULL}, {"dnode-mread", dnodeInitMRead, NULL},
{"dnode-mwrite", dnodeInitMWrite, NULL}, {"dnode-mwrite", dnodeInitMWrite, NULL},
{"dnode-mpeer", dnodeInitMPeer, NULL}, {"dnode-mpeer", dnodeInitMPeer, NULL},
{"dnode-vnodes", dnodeInitVnodes, dnodeCleanupVnodes}, {"dnode-vnodes", dnodeInitVnodes, dnodeCleanupVnodes},
{"dnode-modules", dnodeInitModules, dnodeCleanupModules}, {"dnode-modules", dnodeInitModules, dnodeCleanupModules},
{"dnode-mread", NULL, dnodeCleanupMRead},
{"dnode-mwrite", NULL, dnodeCleanupMWrite},
{"dnode-mpeer", NULL, dnodeCleanupMPeer},
}; };
static int dnodeCreateDir(const char *dir) { static int dnodeCreateDir(const char *dir) {

7
src/mnode/src/mnodeSdb.c
View File

@ -1176,9 +1176,10 @@ int32_t mnodeCompactWal() {
return -1; return -1;
} }
// close wal // close sdb and sync to disk
walFsync(tsSdbMgmt.wal, true); //walFsync(tsSdbMgmt.wal, true);
walClose(tsSdbMgmt.wal); //walClose(tsSdbMgmt.wal);
sdbCleanUp();
// rename old wal to wal_bak // rename old wal to wal_bak
if (taosRename(tsMnodeDir, tsMnodeBakDir) != 0) { if (taosRename(tsMnodeDir, tsMnodeBakDir) != 0) {