From edfc0b1856e6e5a14a072ad33ec25bd63878723a Mon Sep 17 00:00:00 2001
From: Remi Dettai <rdettai@gmail.com>
Date: Mon, 2 Dec 2024 11:06:36 +0100
Subject: [PATCH] Increase default warmup memory

---
 quickwit/quickwit-config/src/node_config/mod.rs        | 4 ++--
 quickwit/quickwit-config/src/node_config/serialize.rs  | 4 ++--
 quickwit/quickwit-search/src/root.rs                   | 2 +-
 quickwit/quickwit-search/src/search_permit_provider.rs | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/quickwit/quickwit-config/src/node_config/mod.rs b/quickwit/quickwit-config/src/node_config/mod.rs
index bd855ec0395..d8594b85c93 100644
--- a/quickwit/quickwit-config/src/node_config/mod.rs
+++ b/quickwit/quickwit-config/src/node_config/mod.rs
@@ -276,8 +276,8 @@ impl Default for SearcherConfig {
             split_cache: None,
             request_timeout_secs: Self::default_request_timeout_secs(),
             storage_timeout_policy: None,
-            warmup_memory_budget: ByteSize::gb(1),
-            warmup_single_split_initial_allocation: ByteSize::mb(50),
+            warmup_memory_budget: ByteSize::gb(10),
+            warmup_single_split_initial_allocation: ByteSize::gb(1),
         }
     }
 }
diff --git a/quickwit/quickwit-config/src/node_config/serialize.rs b/quickwit/quickwit-config/src/node_config/serialize.rs
index 457cf5c5fae..abecc2c7cf9 100644
--- a/quickwit/quickwit-config/src/node_config/serialize.rs
+++ b/quickwit/quickwit-config/src/node_config/serialize.rs
@@ -617,8 +617,8 @@ mod tests {
                     timeout_millis: 2_000,
                     max_num_retries: 2
                 }),
-                warmup_memory_budget: ByteSize::gb(1),
-                warmup_single_split_initial_allocation: ByteSize::mb(50),
+                warmup_memory_budget: ByteSize::gb(10),
+                warmup_single_split_initial_allocation: ByteSize::gb(50),
             }
         );
         assert_eq!(
diff --git a/quickwit/quickwit-search/src/root.rs b/quickwit/quickwit-search/src/root.rs
index 7cf9fe16bbd..724687148f2 100644
--- a/quickwit/quickwit-search/src/root.rs
+++ b/quickwit/quickwit-search/src/root.rs
@@ -1156,7 +1156,7 @@ async fn refine_and_list_matches(
 /// 2. Merges the search results.
 /// 3. Sends fetch docs requests to multiple leaf nodes.
 /// 4. Builds the response with docs and returns.
-#[instrument(skip_all, fields(request_id))]
+#[instrument(skip_all)]
 pub async fn root_search(
     searcher_context: &SearcherContext,
     mut search_request: SearchRequest,
diff --git a/quickwit/quickwit-search/src/search_permit_provider.rs b/quickwit/quickwit-search/src/search_permit_provider.rs
index f396c42dd01..b3a61f0f68f 100644
--- a/quickwit/quickwit-search/src/search_permit_provider.rs
+++ b/quickwit/quickwit-search/src/search_permit_provider.rs
@@ -146,7 +146,6 @@ impl SearchPermitActor {
                 self.assign_available_permits();
                 permit_sender
                     .send(permits)
-                    .ok()
                     // This is a request response pattern, so we can safely ignore the error.
                     .expect("Receiver lives longer than sender");
             }