From 7ad248d6f6645d898bcd38d19fd8b4bc29462500 Mon Sep 17 00:00:00 2001 From: Weny Xu Date: Fri, 12 Jul 2024 01:35:18 +0800 Subject: [PATCH] fix(config): enable file engine by default (#4345) * fix: enable file engine by default * fix: fix tests --- config/config.md | 2 ++ config/datanode.example.toml | 4 +++ config/standalone.example.toml | 4 +++ src/cmd/tests/load_config_test.rs | 55 +++++++++++++++++-------------- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/config/config.md b/config/config.md index 8838059787..cb90eac70f 100644 --- a/config/config.md +++ b/config/config.md @@ -139,6 +139,7 @@ | `region_engine.mito.memtable.index_max_keys_per_shard` | Integer | `8192` | The max number of keys in one shard.
Only available for `partition_tree` memtable. | | `region_engine.mito.memtable.data_freeze_threshold` | Integer | `32768` | The max rows of data inside the actively writing buffer in one shard.
Only available for `partition_tree` memtable. | | `region_engine.mito.memtable.fork_dictionary_bytes` | String | `1GiB` | Max dictionary bytes.
Only available for `partition_tree` memtable. | +| `region_engine.file` | -- | -- | Enable the file engine. | | `logging` | -- | -- | The logging options. | | `logging.dir` | String | `/tmp/greptimedb/logs` | The directory to store the log files. | | `logging.level` | String | `None` | The log level. Can be `info`/`debug`/`warn`/`error`. | @@ -428,6 +429,7 @@ | `region_engine.mito.memtable.index_max_keys_per_shard` | Integer | `8192` | The max number of keys in one shard.
Only available for `partition_tree` memtable. | | `region_engine.mito.memtable.data_freeze_threshold` | Integer | `32768` | The max rows of data inside the actively writing buffer in one shard.
Only available for `partition_tree` memtable. | | `region_engine.mito.memtable.fork_dictionary_bytes` | String | `1GiB` | Max dictionary bytes.
Only available for `partition_tree` memtable. | +| `region_engine.file` | -- | -- | Enable the file engine. | | `logging` | -- | -- | The logging options. | | `logging.dir` | String | `/tmp/greptimedb/logs` | The directory to store the log files. | | `logging.level` | String | `None` | The log level. Can be `info`/`debug`/`warn`/`error`. | diff --git a/config/datanode.example.toml b/config/datanode.example.toml index 1f06271000..ea8c95cf70 100644 --- a/config/datanode.example.toml +++ b/config/datanode.example.toml @@ -478,6 +478,10 @@ data_freeze_threshold = 32768 ## Only available for `partition_tree` memtable. fork_dictionary_bytes = "1GiB" +[[region_engine]] +## Enable the file engine. +[region_engine.file] + ## The logging options. [logging] ## The directory to store the log files. diff --git a/config/standalone.example.toml b/config/standalone.example.toml index 2e88319511..0944d5985e 100644 --- a/config/standalone.example.toml +++ b/config/standalone.example.toml @@ -501,6 +501,10 @@ data_freeze_threshold = 32768 ## Only available for `partition_tree` memtable. fork_dictionary_bytes = "1GiB" +[[region_engine]] +## Enable the file engine. +[region_engine.file] + ## The logging options. [logging] ## The directory to store the log files. diff --git a/src/cmd/tests/load_config_test.rs b/src/cmd/tests/load_config_test.rs index 3f25c3fdc7..cf1cf6bc50 100644 --- a/src/cmd/tests/load_config_test.rs +++ b/src/cmd/tests/load_config_test.rs @@ -26,6 +26,7 @@ use common_telemetry::logging::LoggingOptions; use common_wal::config::raft_engine::RaftEngineConfig; use common_wal::config::{DatanodeWalConfig, StandaloneWalConfig}; use datanode::config::{DatanodeOptions, RegionEngineConfig, StorageConfig}; +use file_engine::config::EngineConfig; use frontend::frontend::FrontendOptions; use frontend::service_config::datanode::DatanodeClientOptions; use meta_client::MetaClientOptions; @@ -71,18 +72,21 @@ fn test_load_datanode_example_config() { data_home: "/tmp/greptimedb/".to_string(), ..Default::default() }, - region_engine: vec![RegionEngineConfig::Mito(MitoConfig { - num_workers: 8, - auto_flush_interval: Duration::from_secs(3600), - scan_parallelism: 0, - global_write_buffer_size: ReadableSize::gb(1), - global_write_buffer_reject_size: ReadableSize::gb(2), - sst_meta_cache_size: ReadableSize::mb(128), - vector_cache_size: ReadableSize::mb(512), - page_cache_size: ReadableSize::mb(512), - max_background_jobs: 4, - ..Default::default() - })], + region_engine: vec![ + RegionEngineConfig::Mito(MitoConfig { + num_workers: 8, + auto_flush_interval: Duration::from_secs(3600), + scan_parallelism: 0, + global_write_buffer_size: ReadableSize::gb(1), + global_write_buffer_reject_size: ReadableSize::gb(2), + sst_meta_cache_size: ReadableSize::mb(128), + vector_cache_size: ReadableSize::mb(512), + page_cache_size: ReadableSize::mb(512), + max_background_jobs: 4, + ..Default::default() + }), + RegionEngineConfig::File(EngineConfig {}), + ], logging: LoggingOptions { level: Some("info".to_string()), otlp_endpoint: Some("".to_string()), @@ -207,18 +211,21 @@ fn test_load_standalone_example_config() { sync_period: Some(Duration::from_secs(10)), ..Default::default() }), - region_engine: vec![RegionEngineConfig::Mito(MitoConfig { - num_workers: 8, - auto_flush_interval: Duration::from_secs(3600), - scan_parallelism: 0, - global_write_buffer_size: ReadableSize::gb(1), - global_write_buffer_reject_size: ReadableSize::gb(2), - sst_meta_cache_size: ReadableSize::mb(128), - vector_cache_size: ReadableSize::mb(512), - page_cache_size: ReadableSize::mb(512), - max_background_jobs: 4, - ..Default::default() - })], + region_engine: vec![ + RegionEngineConfig::Mito(MitoConfig { + num_workers: 8, + auto_flush_interval: Duration::from_secs(3600), + scan_parallelism: 0, + global_write_buffer_size: ReadableSize::gb(1), + global_write_buffer_reject_size: ReadableSize::gb(2), + sst_meta_cache_size: ReadableSize::mb(128), + vector_cache_size: ReadableSize::mb(512), + page_cache_size: ReadableSize::mb(512), + max_background_jobs: 4, + ..Default::default() + }), + RegionEngineConfig::File(EngineConfig {}), + ], storage: StorageConfig { data_home: "/tmp/greptimedb/".to_string(), ..Default::default()