From 98003e6860ec6bd9b21149ef263a6113aea7c8d0 Mon Sep 17 00:00:00 2001 From: smiklos Date: Thu, 3 Aug 2023 17:25:23 +0200 Subject: [PATCH] fix record progress --- .../quickwit-index-management/src/garbage_collection.rs | 6 +++--- quickwit/quickwit-index-management/src/index.rs | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/quickwit/quickwit-index-management/src/garbage_collection.rs b/quickwit/quickwit-index-management/src/garbage_collection.rs index 905da492604..d82af7905fa 100644 --- a/quickwit/quickwit-index-management/src/garbage_collection.rs +++ b/quickwit/quickwit-index-management/src/garbage_collection.rs @@ -248,9 +248,9 @@ pub async fn delete_splits_from_storage_and_metastore( .collect::>(); let delete_result = protect_future(progress_opt, storage.bulk_delete(&split_paths)).await; - // if let Some(ctx) = ctx_opt { - // ctx.record_progress(); - // } + if let Some(progress) = progress_opt { + progress.record_progress(); + } let mut successes = Vec::with_capacity(split_infos.len()); let mut storage_error: Option = None; let mut storage_failures = Vec::new(); diff --git a/quickwit/quickwit-index-management/src/index.rs b/quickwit/quickwit-index-management/src/index.rs index 19c864e0e7c..4aaf81ed759 100644 --- a/quickwit/quickwit-index-management/src/index.rs +++ b/quickwit/quickwit-index-management/src/index.rs @@ -32,7 +32,10 @@ use quickwit_storage::{StorageResolver, StorageResolverError}; use thiserror::Error; use tracing::{error, info}; -use crate::garbage_collection::*; +use crate::garbage_collection::{ + delete_splits_from_storage_and_metastore, run_garbage_collect, DeleteSplitsError, + SplitRemovalInfo, +}; #[derive(Error, Debug)] pub enum IndexServiceError {