Fixed bug introduced by PR

Author: fulmicoton

quickwit/quickwit-config/src/node_config/mod.rs

@@ -111,6 +111,7 @@ impl Default for IndexerConfig {
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct SplitCacheLimits {
     pub max_num_bytes: Byte,
     #[serde(default = "SplitCacheLimits::default_max_num_splits")]

quickwit/quickwit-indexing/src/actors/uploader.rs

@@ -979,7 +979,7 @@ mod tests {
                         uncompressed_docs_size_in_bytes: 1_000,
                         num_docs: 10,
                         replaced_split_ids: Vec::new(),
-                        split_id: "split_ulid_str".to_string(),
+                        split_id: SPLIT_ULID_STR.to_string(),
                         delete_opstamp: 10,
                         num_merge_ops: 0,
                     },

quickwit/quickwit-search/src/search_job_placer.rs

@@ -80,7 +80,10 @@ impl EventSubscriber<ReportSplitsRequest> for SearchJobPlacer {
                 // This actually never happens thanks to the if-condition at the
                 // top of this function.
                 .expect("`nodes` should not be empty.");
-            splits_per_node.entry(*node_addr).or_default();
+            splits_per_node
+                .entry(*node_addr)
+                .or_default()
+                .push(report_split);
         }
         for (node_addr, report_splits) in splits_per_node {
             if let Some(search_client) = nodes.get_mut(&node_addr) {

quickwit/quickwit-storage/src/split_cache/download_task.rs

@@ -24,7 +24,7 @@ use std::time::Duration;
 
 use quickwit_common::split_file;
 use tokio::sync::{OwnedSemaphorePermit, Semaphore};
-use tracing::error;
+use tracing::{error, instrument};
 use ulid::Ulid;
 
 use crate::split_cache::split_table::{CandidateSplit, DownloadOpportunity, SplitTable};
@@ -35,9 +35,10 @@ use crate::StorageResolver;
 ///
 /// At this point, the disk space is already accounted as released,
 /// so the error could result in a "disk space leak".
+#[instrument]
 async fn delete_evicted_splits(root_path: &Path, splits_to_delete: &[Ulid]) {
     for &split_to_delete in splits_to_delete {
-        let split_file_path = root_path.join(split_to_delete.to_string());
+        let split_file_path = root_path.join(split_file(split_to_delete));
         if let Err(_io_err) = tokio::fs::remove_file(&split_file_path).await {
             // This is an pretty critical error. The split size is not tracked anymore at this
             // point.
@@ -65,7 +66,7 @@ async fn download_split(
     Ok(num_bytes)
 }
 
-async fn perform_download(
+async fn perform_eviction_and_download(
     download_opportunity: DownloadOpportunity,
     root_path: PathBuf,
     storage_resolver: StorageResolver,
@@ -99,7 +100,7 @@ pub(crate) fn spawn_download_task(
                 .unwrap()
                 .find_download_opportunity();
             if let Some(download_opportunity) = download_opportunity_opt {
-                tokio::task::spawn(perform_download(
+                tokio::task::spawn(perform_eviction_and_download(
                     download_opportunity,
                     root_path.clone(),
                     storage_resolver.clone(),

quickwit/quickwit-storage/src/split_cache/split_table.rs

@@ -340,7 +340,7 @@ impl SplitTable {
     }
 
     fn is_out_of_limits(&self) -> bool {
-        if self.candidate_splits.is_empty() {
+        if self.on_disk_splits.is_empty() {
             return false;
         }
         if self.on_disk_splits.len() + self.downloading_splits.len()