From a1de2b919fd5d6168f2bcdf8d27d8127a14a79af Mon Sep 17 00:00:00 2001 From: Little-Wallace Date: Thu, 23 Mar 2023 13:49:16 +0800 Subject: [PATCH 1/2] fix trivial move failed Signed-off-by: Little-Wallace --- src/meta/src/hummock/manager/mod.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/meta/src/hummock/manager/mod.rs b/src/meta/src/hummock/manager/mod.rs index d990c25f2d1e6..9071c03961cc0 100644 --- a/src/meta/src/hummock/manager/mod.rs +++ b/src/meta/src/hummock/manager/mod.rs @@ -822,6 +822,13 @@ where Some(task) => task, }; compact_task.watermark = watermark; + // to get all relational table_id from sst_info + compact_task.existing_table_ids = current_version + .levels + .get(&compaction_group_id) + .unwrap() + .member_table_ids + .clone(); if CompactStatus::is_trivial_move_task(&compact_task) && can_trivial_move { compact_task.sorted_output_ssts = compact_task.input_ssts[0].table_infos.clone(); @@ -838,13 +845,6 @@ where start_time.elapsed() ); } else { - // to get all relational table_id from sst_info - compact_task.existing_table_ids = current_version - .levels - .get(&compaction_group_id) - .unwrap() - .member_table_ids - .clone(); compact_task.table_options = table_id_to_option .into_iter() .filter_map(|(table_id, table_option)| { @@ -1987,7 +1987,7 @@ where .scale_compactor_core_num .set(suggest_scale_out_core as i64); - tracing::info!( + tracing::debug!( "report_scale_compactor_info {:?} suggest_scale_out_core {:?}", info, suggest_scale_out_core From dde28cfdb602b40754566a6eca35f5a8d32dada5 Mon Sep 17 00:00:00 2001 From: Little-Wallace Date: Thu, 23 Mar 2023 16:17:46 +0800 Subject: [PATCH 2/2] fix comment Signed-off-by: Little-Wallace --- src/meta/src/hummock/manager/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meta/src/hummock/manager/mod.rs b/src/meta/src/hummock/manager/mod.rs index 9071c03961cc0..ca045bb03cded 100644 --- a/src/meta/src/hummock/manager/mod.rs +++ b/src/meta/src/hummock/manager/mod.rs @@ -822,7 +822,6 @@ where Some(task) => task, }; compact_task.watermark = watermark; - // to get all relational table_id from sst_info compact_task.existing_table_ids = current_version .levels .get(&compaction_group_id) @@ -1142,6 +1141,7 @@ where } } let is_success = if let TaskStatus::Success = compact_task.task_status() { + // if member_table_ids changes, the data of sstable may stale. let is_expired = current_version .levels .get(&compact_task.compaction_group_id)