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

[TD-4034]when config changed,apply a commit msg then config will be applied

This commit is contained in:
lichuang 2021-05-26 18:27:04 +08:00
parent 1062357eee
commit da4b78f1ba
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tsdb/src/tsdbCommit.c
View File

@ -90,6 +90,9 @@ static int tsdbApplyRtn(STsdbRepo *pRepo);
static int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn); static int tsdbApplyRtnOnFSet(STsdbRepo *pRepo, SDFileSet *pSet, SRtn *pRtn);
void *tsdbCommitData(STsdbRepo *pRepo) { void *tsdbCommitData(STsdbRepo *pRepo) {
if (pRepo->imem == NULL) {
return NULL;
}
tsdbStartCommit(pRepo); tsdbStartCommit(pRepo);
// Commit to update meta file // Commit to update meta file

6
src/tsdb/src/tsdbMain.c
View File

@ -268,6 +268,12 @@ int32_t tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg) {
repo->config_changed = true; repo->config_changed = true;
pthread_mutex_unlock(&repo->save_mutex); pthread_mutex_unlock(&repo->save_mutex);
// schedule a commit msg then the new config will be applyed immediatly
if (tsdbLockRepo(repo) < 0) return -1;
tsdbScheduleCommit(repo);
if (tsdbUnlockRepo(repo) < 0) return -1;
return 0; return 0;
#if 0 #if 0
STsdbRepo *pRepo = (STsdbRepo *)repo; STsdbRepo *pRepo = (STsdbRepo *)repo;