From 1a3448ffbcb3db1afa9441e407435f68eb10d993 Mon Sep 17 00:00:00 2001
From: lichuang <lichuang1982@gmail.com>
Date: Tue, 17 Aug 2021 14:08:50 +0800
Subject: [PATCH] [TD-4352]<feature>disable tsdbMetaCompactRatio by default

---
 packaging/cfg/taos.cfg    | 2 +-
 src/inc/taosdef.h         | 2 +-
 src/tsdb/src/tsdbCommit.c | 2 +-
 src/tsdb/src/tsdbMeta.c   | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index fdbb5829f8..06e7cb7da0 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -285,4 +285,4 @@ keepColumnName            1
 # queryBufferSize         -1
 
 # percent of redundant data in tsdb meta will compact meta data,0 means donot compact
-# tsdbMetaCompactRatio    30
+# tsdbMetaCompactRatio    0
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 66811326ee..4f70fd71f0 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -275,7 +275,7 @@ do { \
 #define TSDB_MAX_TABLES                 10000000
 #define TSDB_DEFAULT_TABLES             1000000
 #define TSDB_TABLES_STEP                1000
-#define TSDB_META_COMPACT_RATIO         30
+#define TSDB_META_COMPACT_RATIO         0       // disable tsdb meta compact by default
 
 #define TSDB_MIN_DAYS_PER_FILE          1
 #define TSDB_MAX_DAYS_PER_FILE          3650 
diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c
index 6bd47247a2..dd5dec81e0 100644
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
@@ -536,7 +536,7 @@ static int tsdbCompactMetaFile(STsdbRepo *pRepo, STsdbFS *pfs, SMFile *pMFile) {
   code = 0;
 
 _err:
-  TSDB_FILE_FSYNC(&mf);
+  if (code == 0) TSDB_FILE_FSYNC(&mf);
   tsdbCloseMFile(&mf);
   tsdbCloseMFile(pMFile);
 
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 62c3a06321..eba14cbb87 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -746,7 +746,10 @@ void tsdbUpdateTableSchema(STsdbRepo *pRepo, STable *pTable, STSchema *pSchema,
   TSDB_WUNLOCK_TABLE(pCTable);
 
   if (insertAct) {
-    ASSERT(tsdbInsertNewTableAction(pRepo, pCTable) == 0);
+    if (tsdbInsertNewTableAction(pRepo, pCTable) != 0) {
+      tsdbError("vgId:%d table %s tid %d uid %" PRIu64 " tsdbInsertNewTableAction fail", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+            TABLE_TID(pTable), TABLE_UID(pTable));
+    }
   }
 }