From 609f97e6f2a6baef171389181d21633c33aa4434 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 25 Apr 2024 11:04:41 +0800 Subject: [PATCH 1/3] enh: enlarge number of mounted disks --- include/util/tdef.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/util/tdef.h b/include/util/tdef.h index 6402ef902c..6ded54dc00 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -188,8 +188,8 @@ typedef enum ELogicConditionType { LOGIC_COND_TYPE_NOT, } ELogicConditionType; -#define ENCRYPTED_LEN(len) (len/16) * 16 + (len%16?1:0) * 16 -#define ENCRYPT_KEY_LEN 16 +#define ENCRYPTED_LEN(len) (len / 16) * 16 + (len % 16 ? 1 : 0) * 16 +#define ENCRYPT_KEY_LEN 16 #define ENCRYPT_KEY_LEN_MIN 8 #define TSDB_INT32_ID_LEN 11 @@ -525,7 +525,7 @@ typedef enum ELogicConditionType { #define TSDB_ARB_DUMMY_TIME 4765104000000 // 2121-01-01 00:00:00.000, :P #define TFS_MAX_TIERS 3 -#define TFS_MAX_DISKS_PER_TIER 16 +#define TFS_MAX_DISKS_PER_TIER 128 #define TFS_MAX_DISKS (TFS_MAX_TIERS * TFS_MAX_DISKS_PER_TIER) #define TFS_MIN_LEVEL 0 #define TFS_MAX_LEVEL (TFS_MAX_TIERS - 1) @@ -535,7 +535,7 @@ typedef enum ELogicConditionType { enum { TRANS_STAT_INIT = 0, TRANS_STAT_EXECUTING, TRANS_STAT_EXECUTED, TRANS_STAT_ROLLBACKING, TRANS_STAT_ROLLBACKED }; enum { TRANS_OPER_INIT = 0, TRANS_OPER_EXECUTE, TRANS_OPER_ROLLBACK }; -enum { ENCRYPT_KEY_STAT_UNKNOWN = 0, ENCRYPT_KEY_STAT_UNSET, ENCRYPT_KEY_STAT_SET, ENCRYPT_KEY_STAT_LOADED}; +enum { ENCRYPT_KEY_STAT_UNKNOWN = 0, ENCRYPT_KEY_STAT_UNSET, ENCRYPT_KEY_STAT_SET, ENCRYPT_KEY_STAT_LOADED }; typedef struct { char dir[TSDB_FILENAME_LEN]; From 1cf2f825984652c753ffff4a066683f83f21f6bf Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 25 Apr 2024 11:30:56 +0800 Subject: [PATCH 2/3] change doc --- docs/zh/21-tdinternal/01-arch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/21-tdinternal/01-arch.md b/docs/zh/21-tdinternal/01-arch.md index e2480b6682..52212bc714 100644 --- a/docs/zh/21-tdinternal/01-arch.md +++ b/docs/zh/21-tdinternal/01-arch.md @@ -201,7 +201,7 @@ TDengine 采用数据驱动的方式让缓存中的数据写入硬盘进行持 除此之外，TDengine 也提供了数据分级存储的功能，将不同时间段的数据存储在挂载的不同介质上的目录里，从而实现不同“热度”的数据存储在不同的存储介质上，充分利用存储，节约成本。比如，最新采集的数据需要经常访问，对硬盘的读取性能要求高，那么用户可以配置将这些数据存储在 SSD 盘上。超过一定期限的数据，查询需求量没有那么高，那么可以存储在相对便宜的 HDD 盘上。 -多级存储支持 3 级，每级最多可配置 16 个挂载点。 +多级存储支持 3 级，每级最多可配置 128 个挂载点。 TDengine 多级存储配置方式如下（在配置文件/etc/taos/taos.cfg 中）： From d65bd323d8fe19baff32aba3bc8c04e1b86188fe Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 25 Apr 2024 18:12:56 +0800 Subject: [PATCH 3/3] fix test case --- tests/system-test/0-others/multilevel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system-test/0-others/multilevel.py b/tests/system-test/0-others/multilevel.py index def2c3152b..7b0ebb4b78 100644 --- a/tests/system-test/0-others/multilevel.py +++ b/tests/system-test/0-others/multilevel.py @@ -182,10 +182,10 @@ class TDTestCase: else: checkFiles("%s/*/*" % i, 0) - def more_than_16_disks(self): - tdLog.info("============== more_than_16_disks test ===============") + def more_than_128_disks(self): + tdLog.info("============== more_than_128_disks test ===============") cfg={} - for i in range(17): + for i in range(129): if i == 0 : datadir = '/mnt/data%d 0 1' % (i+1) else: @@ -272,7 +272,7 @@ class TDTestCase: self.dir_permission_denied() self.file_distribution_same_level() self.three_level_basic() - self.more_than_16_disks() + self.more_than_128_disks() self.trim_database() self.missing_middle_level()