From 11996d25768daadf15f95007c41b95482ff3cff9 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Tue, 17 Aug 2021 21:42:23 +0000
Subject: [PATCH] [TD-6131]<fix> show vnodes crash

---
 src/common/inc/tglobal.h | 3 +++
 src/common/src/tglobal.c | 5 +++++
 src/tsdb/src/tsdbFS.c    | 4 +---
 src/util/inc/tconfig.h   | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index 947fed60e4..4b8347ead0 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -107,6 +107,9 @@ extern int32_t tsQuorum;
 extern int8_t  tsUpdate;
 extern int8_t  tsCacheLastRow;
 
+//tsdb 
+extern bool tsdbForceKeepFile;
+
 // balance
 extern int8_t  tsEnableBalance;
 extern int8_t  tsAlternativeRole;
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 44b3e87e7d..b7930dd43e 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -151,6 +151,11 @@ int32_t tsMinTablePerVnode = TSDB_TABLES_STEP;
 int32_t tsMaxTablePerVnode = TSDB_DEFAULT_TABLES;
 int32_t tsTableIncStepPerVnode = TSDB_TABLES_STEP;
 
+// tsdb config 
+
+// For backward compatibility
+bool tsdbForceKeepFile = false;
+
 // balance
 int8_t  tsEnableBalance = 1;
 int8_t  tsAlternativeRole = 0;
diff --git a/src/tsdb/src/tsdbFS.c b/src/tsdb/src/tsdbFS.c
index 68450301d8..63f89c1957 100644
--- a/src/tsdb/src/tsdbFS.c
+++ b/src/tsdb/src/tsdbFS.c
@@ -37,8 +37,6 @@ static void tsdbScanAndTryFixDFilesHeader(STsdbRepo *pRepo, int32_t *nExpired);
 static int  tsdbProcessExpiredFS(STsdbRepo *pRepo);
 static int  tsdbCreateMeta(STsdbRepo *pRepo);
 
-// For backward compatibility
-bool tsdbForceKeepFile = false;
 // ================== CURRENT file header info
 static int tsdbEncodeFSHeader(void **buf, SFSHeader *pHeader) {
   int tlen = 0;
@@ -1354,4 +1352,4 @@ static void tsdbScanAndTryFixDFilesHeader(STsdbRepo *pRepo, int32_t *nExpired) {
 
     tsdbCloseDFileSet(&fset);
   }
-}
\ No newline at end of file
+}
diff --git a/src/util/inc/tconfig.h b/src/util/inc/tconfig.h
index f146ec0b8b..d03ce6e0f1 100644
--- a/src/util/inc/tconfig.h
+++ b/src/util/inc/tconfig.h
@@ -81,7 +81,6 @@ typedef struct {
 extern SGlobalCfg tsGlobalConfig[];
 extern int32_t    tsGlobalConfigNum;
 extern char *     tsCfgStatusStr[];
-extern bool       tsdbForceKeepFile;
 
 void taosReadGlobalLogCfg();
 bool taosReadGlobalCfg();