From e9a3969b8e3a4ff1ce53cf0d6610aeff336f1d8e Mon Sep 17 00:00:00 2001
From: lichuang <lichuang1982@gmail.com>
Date: Tue, 1 Jun 2021 19:36:59 +0800
Subject: [PATCH] [TD-3963]async commit a msg to save config

---
 src/tsdb/inc/tsdbMemTable.h    |  1 +
 src/tsdb/src/tsdbCommitQueue.c |  9 ++++++++-
 src/tsdb/src/tsdbMain.c        |  2 +-
 src/tsdb/src/tsdbMemTable.c    | 17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/tsdb/inc/tsdbMemTable.h b/src/tsdb/inc/tsdbMemTable.h
index 6046274af4..868a10d361 100644
--- a/src/tsdb/inc/tsdbMemTable.h
+++ b/src/tsdb/inc/tsdbMemTable.h
@@ -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);
diff --git a/src/tsdb/src/tsdbCommitQueue.c b/src/tsdb/src/tsdbCommitQueue.c
index abea79bc4f..4d4585421c 100644
--- a/src/tsdb/src/tsdbCommitQueue.c
+++ b/src/tsdb/src/tsdbCommitQueue.c
@@ -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);
   }
 
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index afbedd5b2f..3a375ec59c 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -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
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index 79dbb8be5d..4ca7b3b820 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -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;
-- 
GitLab