From d3e4b2dfe77df6ac1cbff6346867c76866dea074 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Fri, 14 Mar 2025 13:07:51 +0100 Subject: [PATCH] Accept total batch size in human size --- crates/meilisearch/src/analytics/segment_analytics.rs | 3 ++- crates/meilisearch/src/lib.rs | 2 +- crates/meilisearch/src/option.rs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/meilisearch/src/analytics/segment_analytics.rs b/crates/meilisearch/src/analytics/segment_analytics.rs index a681e9e29..c428aa2b8 100644 --- a/crates/meilisearch/src/analytics/segment_analytics.rs +++ b/crates/meilisearch/src/analytics/segment_analytics.rs @@ -326,7 +326,8 @@ impl Infos { http_addr: http_addr != default_http_addr(), http_payload_size_limit, experimental_max_number_of_batched_tasks, - experimental_limit_batched_tasks_total_size, + experimental_limit_batched_tasks_total_size: + experimental_limit_batched_tasks_total_size.into(), task_queue_webhook: task_webhook_url.is_some(), task_webhook_authorization_header: task_webhook_authorization_header.is_some(), log_level: log_level.to_string(), diff --git a/crates/meilisearch/src/lib.rs b/crates/meilisearch/src/lib.rs index 1841d5556..7dd1b58b4 100644 --- a/crates/meilisearch/src/lib.rs +++ b/crates/meilisearch/src/lib.rs @@ -228,7 +228,7 @@ pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc, Arc< cleanup_enabled: !opt.experimental_replication_parameters, max_number_of_tasks: 1_000_000, max_number_of_batched_tasks: opt.experimental_max_number_of_batched_tasks, - batched_tasks_size_limit: opt.experimental_limit_batched_tasks_total_size, + batched_tasks_size_limit: opt.experimental_limit_batched_tasks_total_size.into(), index_growth_amount: byte_unit::Byte::from_str("10GiB").unwrap().as_u64() as usize, index_count: DEFAULT_INDEX_COUNT, instance_features: opt.to_instance_features(), diff --git a/crates/meilisearch/src/option.rs b/crates/meilisearch/src/option.rs index acf4393d3..6364f49d8 100644 --- a/crates/meilisearch/src/option.rs +++ b/crates/meilisearch/src/option.rs @@ -444,7 +444,7 @@ pub struct Opt { /// see: #[clap(long, env = MEILI_EXPERIMENTAL_LIMIT_BATCHED_TASKS_TOTAL_SIZE, default_value_t = default_limit_batched_tasks_total_size())] #[serde(default = "default_limit_batched_tasks_total_size")] - pub experimental_limit_batched_tasks_total_size: u64, + pub experimental_limit_batched_tasks_total_size: Byte, #[serde(flatten)] #[clap(flatten)] @@ -944,8 +944,8 @@ fn default_limit_batched_tasks() -> usize { usize::MAX } -fn default_limit_batched_tasks_total_size() -> u64 { - u64::MAX +fn default_limit_batched_tasks_total_size() -> Byte { + Byte::from_u64(u64::MAX) } fn default_snapshot_dir() -> PathBuf {