From d2f5914d73bf7564437ee72558af6ed50bf64bd4 Mon Sep 17 00:00:00 2001 From: Hengfei Yang Date: Sat, 3 Feb 2024 21:40:38 +0800 Subject: [PATCH] fix: compactor with block org (#2646) --- src/ingester/src/writer.rs | 2 +- src/service/compact/mod.rs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ingester/src/writer.rs b/src/ingester/src/writer.rs index 5e9c20fda7..f4a8c0e72e 100644 --- a/src/ingester/src/writer.rs +++ b/src/ingester/src/writer.rs @@ -209,7 +209,7 @@ impl Writer { Arc::new(immutable::Immutable::new(thread_id, key.clone(), old_mem)), ); log::info!( - "[INGESTER:WAL] done add to IMMUTABLES, file: {}/{}/{}/{}.wal", + "[INGESTER:WAL] done add to IMMUTABLES, file: {}/{}/{}/{}.wal", thread_id, &key.org_id, &key.stream_type, diff --git a/src/service/compact/mod.rs b/src/service/compact/mod.rs index 2d87a56741..4175a9482c 100644 --- a/src/service/compact/mod.rs +++ b/src/service/compact/mod.rs @@ -173,6 +173,13 @@ pub async fn run_merge() -> Result<(), anyhow::Error> { StreamType::Metadata, ]; for org_id in orgs { + // check backlist + if !db::file_list::BLOCKED_ORGS.is_empty() + && db::file_list::BLOCKED_ORGS.contains(&org_id.as_str()) + { + continue; + } + // get the working node for the organization let (_, node) = db::compact::organization::get_offset(&org_id, "merge").await; if !node.is_empty() && LOCAL_NODE_UUID.ne(&node) && get_node_by_uuid(&node).is_some() {