From b61a388d046dc752d313a58a48e6f8352eca4597 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Mon, 14 Oct 2024 20:46:07 +0800 Subject: [PATCH] refactor: replace info logs with debug logs in region server (#4829) * refactor: replace info logs with debug logs in region server Signed-off-by: Ruihang Xia * fix: update error handling for closing and opening nonexistent regions Signed-off-by: Ruihang Xia --------- Signed-off-by: Ruihang Xia --- src/datanode/src/region_server.rs | 8 +++++--- src/metric-engine/src/engine.rs | 4 ++-- src/metric-engine/src/engine/close.rs | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/datanode/src/region_server.rs b/src/datanode/src/region_server.rs index 0bac53e4d6..b6e1eb0404 100644 --- a/src/datanode/src/region_server.rs +++ b/src/datanode/src/region_server.rs @@ -32,7 +32,7 @@ use common_recordbatch::SendableRecordBatchStream; use common_runtime::Runtime; use common_telemetry::tracing::{self, info_span}; use common_telemetry::tracing_context::{FutureExt, TracingContext}; -use common_telemetry::{error, info, warn}; +use common_telemetry::{debug, error, info, warn}; use dashmap::DashMap; use datafusion::datasource::{provider_as_source, TableProvider}; use datafusion::error::Result as DfResult; @@ -893,7 +893,7 @@ impl RegionServerInner { for region in logical_regions { self.region_map .insert(region, RegionEngineWithStatus::Ready(engine.clone())); - info!("Logical region {} is registered!", region); + debug!("Logical region {} is registered!", region); } Ok(()) } @@ -935,17 +935,19 @@ impl RegionServerInner { .iter() .map(|x| (*x.key(), x.value().clone())) .collect::>(); + let num_regions = regions.len(); for (region_id, engine) in regions { let closed = engine .handle_request(region_id, RegionRequest::Close(RegionCloseRequest {})) .await; match closed { - Ok(_) => info!("Region {region_id} is closed"), + Ok(_) => debug!("Region {region_id} is closed"), Err(e) => warn!("Failed to close region {region_id}, err: {e}"), } } self.region_map.clear(); + info!("closed {num_regions} regions"); let engines = self.engines.write().unwrap().drain().collect::>(); for (engine_name, engine) in engines { diff --git a/src/metric-engine/src/engine.rs b/src/metric-engine/src/engine.rs index 42948aa6cd..ab789db661 100644 --- a/src/metric-engine/src/engine.rs +++ b/src/metric-engine/src/engine.rs @@ -338,7 +338,7 @@ mod test { .await .unwrap(); - // close nonexistent region + // close nonexistent region won't report error let nonexistent_region_id = RegionId::new(12313, 12); engine .handle_request( @@ -346,7 +346,7 @@ mod test { RegionRequest::Close(RegionCloseRequest {}), ) .await - .unwrap_err(); + .unwrap(); // open nonexistent region won't report error let invalid_open_request = RegionOpenRequest { diff --git a/src/metric-engine/src/engine/close.rs b/src/metric-engine/src/engine/close.rs index ad89fce36a..677f488b73 100644 --- a/src/metric-engine/src/engine/close.rs +++ b/src/metric-engine/src/engine/close.rs @@ -14,13 +14,14 @@ //! Close a metric region +use common_telemetry::debug; use snafu::ResultExt; use store_api::region_engine::RegionEngine; use store_api::region_request::{AffectedRows, RegionCloseRequest, RegionRequest}; use store_api::storage::RegionId; use super::MetricEngineInner; -use crate::error::{CloseMitoRegionSnafu, LogicalRegionNotFoundSnafu, Result}; +use crate::error::{CloseMitoRegionSnafu, Result}; use crate::metrics::PHYSICAL_REGION_COUNT; use crate::utils; @@ -54,7 +55,8 @@ impl MetricEngineInner { { Ok(0) } else { - Err(LogicalRegionNotFoundSnafu { region_id }.build()) + debug!("Closing a non-existent logical region {}", region_id); + Ok(0) } }