feat: add minDiskFreeSize cfg

cmake/apr-util_CMakeLists.txt.in

@@ -11,7 +11,7 @@ ExternalProject_Add(aprutil-1
         BUILD_IN_SOURCE TRUE
         BUILD_ALWAYS 1
         #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1 --without-expat
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1 
         #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
         BUILD_COMMAND make
         INSTALL_COMMAND make install

include/common/tglobal.h

@@ -161,6 +161,7 @@ extern char     tsCompressor[];
 // tfs
 extern int32_t  tsDiskCfgNum;
 extern SDiskCfg tsDiskCfg[];
+extern int64_t  tsMinDiskFreeSize;
 
 // udf
 extern bool tsStartUdfd;

include/util/tdef.h

@@ -200,7 +200,7 @@ typedef enum ELogicConditionType {
 #define TSDB_STREAM_NAME_LEN          193                                // it is a null-terminated string
 #define TSDB_DB_NAME_LEN              65
 #define TSDB_DB_FNAME_LEN             (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
-#define TSDB_PRIVILEDGE_CONDITION_LEN 48*1024
+#define TSDB_PRIVILEDGE_CONDITION_LEN 48 * 1024
 
 #define TSDB_FUNC_NAME_LEN       65
 #define TSDB_FUNC_COMMENT_LEN    1024 * 1024
@@ -228,8 +228,8 @@ typedef enum ELogicConditionType {
 #define TSDB_MAX_SQL_SHOW_LEN    1024
 #define TSDB_MAX_ALLOWED_SQL_LEN (1 * 1024 * 1024u)  // sql length should be less than 1mb
 
-#define TSDB_APP_NAME_LEN   TSDB_UNI_LEN
-#define TSDB_TB_COMMENT_LEN 1025
+#define TSDB_APP_NAME_LEN    TSDB_UNI_LEN
+#define TSDB_TB_COMMENT_LEN  1025
 #define TSDB_COL_COMMENT_LEN 1025
 
 #define TSDB_QUERY_ID_LEN   26
@@ -377,12 +377,12 @@ typedef enum ELogicConditionType {
 #define TSDB_MAX_STT_TRIGGER     1
 #define TSDB_DEFAULT_SST_TRIGGER 1
 #endif
-#define TSDB_MIN_HASH_PREFIX            (2 - TSDB_TABLE_NAME_LEN)
-#define TSDB_MAX_HASH_PREFIX            (TSDB_TABLE_NAME_LEN - 2)
-#define TSDB_DEFAULT_HASH_PREFIX        0
-#define TSDB_MIN_HASH_SUFFIX            (2 - TSDB_TABLE_NAME_LEN)
-#define TSDB_MAX_HASH_SUFFIX            (TSDB_TABLE_NAME_LEN - 2)
-#define TSDB_DEFAULT_HASH_SUFFIX        0
+#define TSDB_MIN_HASH_PREFIX     (2 - TSDB_TABLE_NAME_LEN)
+#define TSDB_MAX_HASH_PREFIX     (TSDB_TABLE_NAME_LEN - 2)
+#define TSDB_DEFAULT_HASH_PREFIX 0
+#define TSDB_MIN_HASH_SUFFIX     (2 - TSDB_TABLE_NAME_LEN)
+#define TSDB_MAX_HASH_SUFFIX     (TSDB_TABLE_NAME_LEN - 2)
+#define TSDB_DEFAULT_HASH_SUFFIX 0
 
 #define TSDB_DB_MIN_WAL_RETENTION_PERIOD -1
 #define TSDB_REP_DEF_DB_WAL_RET_PERIOD   3600

source/common/src/tglobal.c

@@ -186,6 +186,7 @@ int32_t tsCacheLazyLoadThreshold = 500;
 
 int32_t  tsDiskCfgNum = 0;
 SDiskCfg tsDiskCfg[TFS_MAX_DISKS] = {0};
+int64_t  tsMinDiskFreeSize = TFS_MIN_DISK_FREE_SIZE;
 
 // stream scheduler
 bool tsDeployOnSnode = true;
@@ -239,8 +240,8 @@ bool    tsDisableStream = false;
 int64_t tsStreamBufferSize = 128 * 1024 * 1024;
 int64_t tsCheckpointInterval = 3 * 60 * 60 * 1000;
 bool    tsFilterScalarMode = false;
-int32_t tsKeepTimeOffset = 0;  // latency of data migration
-int     tsResolveFQDNRetryTime = 100; //seconds
+int32_t tsKeepTimeOffset = 0;          // latency of data migration
+int     tsResolveFQDNRetryTime = 100;  // seconds
 
 char   tsS3Endpoint[TSDB_FQDN_LEN] = "<endpoint>";
 char   tsS3AccessKey[TSDB_FQDN_LEN] = "<accesskey>";
@@ -305,9 +306,7 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
   return 0;
 }
 
-struct SConfig *taosGetCfg() {
-  return tsCfg;
-}
+struct SConfig *taosGetCfg() { return tsCfg; }
 
 static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *inputCfgDir, const char *envFile,
                            char *apolloUrl) {
@@ -635,6 +634,11 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddString(pCfg, "s3Endpoint", tsS3Endpoint, CFG_SCOPE_SERVER) != 0) return -1;
   if (cfgAddString(pCfg, "s3BucketName", tsS3BucketName, CFG_SCOPE_SERVER) != 0) return -1;
 
+  // min free disk space used to check if the disk is full [50MB, 1GB]
+  if (cfgAddInt64(pCfg, "minDiskFreeSize", tsMinDiskFreeSize, TFS_MIN_DISK_FREE_SIZE, 1024 * 1024 * 1024,
+                  CFG_SCOPE_SERVER) != 0)
+    return -1;
+
   GRANT_CFG_ADD;
   return 0;
 }
@@ -1034,6 +1038,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
   tsMaxStreamBackendCache = cfgGetItem(pCfg, "maxStreamBackendCache")->i32;
   tsPQSortMemThreshold = cfgGetItem(pCfg, "pqSortMemThreshold")->i32;
   tsResolveFQDNRetryTime = cfgGetItem(pCfg, "resolveFQDNRetryTime")->i32;
+  tsMinDiskFreeSize = cfgGetItem(pCfg, "minDiskFreeSize")->i64;
 
   GRANT_CFG_GET;
   return 0;

source/libs/tfs/src/tfsTier.c

@@ -16,6 +16,8 @@
 #define _DEFAULT_SOURCE
 #include "tfsInt.h"
 
+extern int64_t tsMinDiskFreeSize;
+
 int32_t tfsInitTier(STfsTier *pTier, int32_t level) {
   memset(pTier, 0, sizeof(STfsTier));
 
@@ -114,7 +116,7 @@ int32_t tfsAllocDiskOnTier(STfsTier *pTier) {
 
     if (pDisk == NULL) continue;
 
-    if (pDisk->size.avail < TFS_MIN_DISK_FREE_SIZE) continue;
+    if (pDisk->size.avail < tsMinDiskFreeSize) continue;
 
     retId = diskId;
     terrno = 0;
@@ -132,7 +134,7 @@ void tfsPosNextId(STfsTier *pTier) {
   for (int32_t id = 1; id < pTier->ndisk; id++) {
     STfsDisk *pLDisk = pTier->disks[nextid];
     STfsDisk *pDisk = pTier->disks[id];
-    if (pDisk->size.avail > TFS_MIN_DISK_FREE_SIZE && pDisk->size.avail > pLDisk->size.avail) {
+    if (pDisk->size.avail > tsMinDiskFreeSize && pDisk->size.avail > pLDisk->size.avail) {
       nextid = id;
     }
   }

source/util/src/tconfig.c

@@ -1019,7 +1019,7 @@ int32_t cfgLoadFromApollUrl(SConfig *pConfig, const char *url) {
 
         code = cfgSetItem(pConfig, name, value, CFG_STYPE_APOLLO_URL);
         if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break;
-        
+
         if (strcasecmp(name, "dataDir") == 0) {
           code = cfgSetTfsItem(pConfig, name, value, value2, value3, CFG_STYPE_APOLLO_URL);
           if (code != 0 && terrno != TSDB_CODE_CFG_NOT_FOUND) break;