[TD-3963]async commit a msg to save config
This commit is contained in:
parent
122241014a
commit
e9a3969b8e
|
@ -66,6 +66,7 @@ int tsdbTakeMemSnapshot(STsdbRepo* pRepo, SMemSnapshot* pSnapshot, SArray* pAT
|
|||
void tsdbUnTakeMemSnapShot(STsdbRepo* pRepo, SMemSnapshot* pSnapshot);
|
||||
void* tsdbAllocBytes(STsdbRepo* pRepo, int bytes);
|
||||
int tsdbAsyncCommit(STsdbRepo* pRepo);
|
||||
int tsdbAsyncCommitConfig(STsdbRepo* pRepo);
|
||||
int tsdbLoadDataFromCache(STable* pTable, SSkipListIterator* pIter, TSKEY maxKey, int maxRowsToRead, SDataCols* pCols,
|
||||
TKEY* filterKeys, int nFilterKeys, bool keepDup, SMergeInfo* pMergeInfo);
|
||||
void* tsdbCommitData(STsdbRepo* pRepo);
|
||||
|
|
|
@ -154,6 +154,7 @@ static void *tsdbLoopCommit(void *arg) {
|
|||
SCommitQueue *pQueue = &tsCommitQueue;
|
||||
SListNode * pNode = NULL;
|
||||
STsdbRepo * pRepo = NULL;
|
||||
bool config_changed = false;
|
||||
|
||||
while (true) {
|
||||
pthread_mutex_lock(&(pQueue->lock));
|
||||
|
@ -177,11 +178,17 @@ static void *tsdbLoopCommit(void *arg) {
|
|||
pRepo = ((SCommitReq *)pNode->data)->pRepo;
|
||||
|
||||
// check if need to apply new config
|
||||
config_changed = pRepo->config_changed;
|
||||
if (pRepo->config_changed) {
|
||||
tsdbApplyRepoConfig(pRepo);
|
||||
}
|
||||
|
||||
tsdbCommitData(pRepo);
|
||||
if (config_changed && pRepo->imem == NULL) {
|
||||
tsem_post(&(pRepo->readyToCommit));
|
||||
} else {
|
||||
tsdbCommitData(pRepo);
|
||||
}
|
||||
|
||||
listNodeFree(pNode);
|
||||
}
|
||||
|
||||
|
|
|
@ -271,7 +271,7 @@ int32_t tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg) {
|
|||
pthread_mutex_unlock(&repo->save_mutex);
|
||||
|
||||
// schedule a commit msg then the new config will be applied immediatly
|
||||
tsdbAsyncCommit(repo);
|
||||
tsdbAsyncCommitConfig(repo);
|
||||
|
||||
return 0;
|
||||
#if 0
|
||||
|
|
|
@ -271,10 +271,25 @@ void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
|
|||
return ptr;
|
||||
}
|
||||
|
||||
int tsdbAsyncCommitConfig(STsdbRepo* pRepo) {
|
||||
ASSERT(pRepo->config_changed == true);
|
||||
tsem_wait(&(pRepo->readyToCommit));
|
||||
|
||||
if (pRepo->code != TSDB_CODE_SUCCESS) {
|
||||
tsdbWarn("vgId:%d try to commit config when TSDB not in good state: %s", REPO_ID(pRepo), tstrerror(terrno));
|
||||
}
|
||||
|
||||
if (tsdbLockRepo(pRepo) < 0) return -1;
|
||||
tsdbScheduleCommit(pRepo);
|
||||
if (tsdbUnlockRepo(pRepo) < 0) return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tsdbAsyncCommit(STsdbRepo *pRepo) {
|
||||
tsem_wait(&(pRepo->readyToCommit));
|
||||
|
||||
//ASSERT(pRepo->imem == NULL);
|
||||
ASSERT(pRepo->imem == NULL);
|
||||
if (pRepo->mem == NULL) {
|
||||
tsem_post(&(pRepo->readyToCommit));
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue