From ff928289dfb2e215e5f9556633c80e54113dc149 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 13 Nov 2020 12:04:21 +0800
Subject: [PATCH] [TD-2081]<hotfix>: fix alter blocks problem

---
 src/tsdb/src/tsdbMain.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 2ded3b668b..a18fa6d0ef 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -294,6 +294,7 @@ STsdbCfg *tsdbGetCfg(const TSDB_REPO_T *repo) {
 int32_t tsdbConfigRepo(TSDB_REPO_T *repo, STsdbCfg *pCfg) {
   // TODO: think about multithread cases
   STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbCfg   config = pRepo->config;
   STsdbCfg * pRCfg = &pRepo->config;
 
   if (tsdbCheckAndSetDefaultCfg(pCfg) < 0) return -1;
@@ -308,22 +309,25 @@ int32_t tsdbConfigRepo(TSDB_REPO_T *repo, STsdbCfg *pCfg) {
   bool configChanged = false;
   if (pRCfg->compression != pCfg->compression) {
     tsdbAlterCompression(pRepo, pCfg->compression);
+    config.compression = pCfg->compression;
     configChanged = true;
   }
   if (pRCfg->keep != pCfg->keep) {
     if (tsdbAlterKeep(pRepo, pCfg->keep) < 0) {
       tsdbError("vgId:%d failed to configure repo when alter keep since %s", REPO_ID(pRepo), tstrerror(terrno));
+      config.keep = pCfg->keep;
       return -1;
     }
     configChanged = true;
   }
   if (pRCfg->totalBlocks != pCfg->totalBlocks) {
     tsdbAlterCacheTotalBlocks(pRepo, pCfg->totalBlocks);
+    config.totalBlocks = pCfg->totalBlocks;
     configChanged = true;
   }
 
   if (configChanged) {
-    if (tsdbSaveConfig(pRepo->rootDir, &pRepo->config) < 0) {
+    if (tsdbSaveConfig(pRepo->rootDir, &config) < 0) {
       tsdbError("vgId:%d failed to configure repository while save config since %s", REPO_ID(pRepo), tstrerror(terrno));
       return -1;
     }
-- 
GitLab