From 459ef3752a4c0694609b7acd0098a3fef4b3e042 Mon Sep 17 00:00:00 2001 From: zhy <55792392+exit-code-1@users.noreply.github.com> Date: Thu, 31 Jul 2025 20:11:43 +0800 Subject: [PATCH 1/2] downgrade error logs Signed-off-by: gengliqi --- components/engine_panic/Cargo.toml | 2 +- components/engine_rocks/Cargo.toml | 2 +- components/engine_traits/Cargo.toml | 2 +- components/hybrid_engine/Cargo.toml | 26 ++++++------ components/in_memory_engine/Cargo.toml | 42 +++++++++---------- .../in_memory_engine/src/region_label.rs | 4 +- components/pd_client/src/client.rs | 2 +- components/pd_client/src/util.rs | 8 ++-- components/raft_log_engine/Cargo.toml | 2 +- .../src/operation/command/write/ingest.rs | 4 +- components/raftstore-v2/src/operation/misc.rs | 4 +- components/raftstore-v2/src/worker/pd/mod.rs | 2 +- .../raftstore-v2/src/worker/pd/store.rs | 2 +- .../raftstore/src/compacted_event_sender.rs | 7 +++- .../src/coprocessor/split_observer.rs | 6 +-- .../raftstore/src/store/entry_storage.rs | 4 +- components/raftstore/src/store/fsm/peer.rs | 16 +++---- components/raftstore/src/store/fsm/store.rs | 11 +++-- components/raftstore/src/store/peer.rs | 7 ++-- .../src/store/worker/cleanup_snapshot.rs | 5 ++- components/raftstore/src/store/worker/pd.rs | 4 +- .../raftstore/src/store/worker/region.rs | 2 +- components/resource_control/src/service.rs | 4 +- components/sst_importer/src/sst_importer.rs | 7 +++- src/server/gc_worker/gc_manager.rs | 5 ++- src/server/raft_client.rs | 12 ++++-- src/server/raft_server.rs | 2 +- src/server/raftkv/raft_extension.rs | 5 ++- src/server/service/batch.rs | 8 ++-- src/server/service/debug.rs | 2 +- src/server/service/kv.rs | 12 +++--- src/server/snap.rs | 6 +-- src/server/tablet_snap.rs | 4 +- 33 files changed, 128 insertions(+), 103 deletions(-) diff --git a/components/engine_panic/Cargo.toml b/components/engine_panic/Cargo.toml index 3ee5d82ad14..c125ef7ccf2 100644 --- a/components/engine_panic/Cargo.toml +++ b/components/engine_panic/Cargo.toml @@ -10,9 +10,9 @@ license = "Apache-2.0" testexport = [] [dependencies] +encryption = { workspace = true } engine_traits = { workspace = true } kvproto = { workspace = true } -encryption = { workspace = true } raft = { workspace = true } tracker = { workspace = true } txn_types = { workspace = true } diff --git a/components/engine_rocks/Cargo.toml b/components/engine_rocks/Cargo.toml index d3893da020a..26ca70e1606 100644 --- a/components/engine_rocks/Cargo.toml +++ b/components/engine_rocks/Cargo.toml @@ -61,6 +61,6 @@ package = "rocksdb" features = ["encryption"] [dev-dependencies] +proptest = "1.0.0" rand = "0.8" toml = "0.5" -proptest = "1.0.0" diff --git a/components/engine_traits/Cargo.toml b/components/engine_traits/Cargo.toml index 2e86822ceac..85b8337ef0d 100644 --- a/components/engine_traits/Cargo.toml +++ b/components/engine_traits/Cargo.toml @@ -11,6 +11,7 @@ testexport = [] [dependencies] collections = { workspace = true } +encryption = { workspace = true } error_code = { workspace = true } fail = "0.5" file_system = { workspace = true } @@ -19,7 +20,6 @@ kvproto = { workspace = true } log_wrappers = { workspace = true } protobuf = "2" raft = { workspace = true } -encryption = { workspace = true } serde = "1.0" slog = { workspace = true } slog-global = { workspace = true } diff --git a/components/hybrid_engine/Cargo.toml b/components/hybrid_engine/Cargo.toml index 3a23f9927da..2938a329f97 100644 --- a/components/hybrid_engine/Cargo.toml +++ b/components/hybrid_engine/Cargo.toml @@ -6,27 +6,27 @@ publish = false license = "Apache-2.0" [dependencies] -engine_traits = { workspace = true } -txn_types = { workspace = true } -tikv_util = { workspace = true } +crossbeam = { workspace = true } engine_rocks = { workspace = true } -online_config = { workspace = true } +engine_traits = { workspace = true } in_memory_engine = { workspace = true } -slog = { workspace = true } -slog-global = { workspace = true } -tempfile = "3.0" +keys = { workspace = true } +kvproto = { workspace = true } +lazy_static = "1.4.0" +online_config = { workspace = true } prometheus = { version = "0.13", default-features = false, features = [ "nightly", ] } prometheus-static-metric = "0.5" -lazy_static = "1.4.0" -crossbeam = { workspace = true } -raftstore = { workspace = true } raft = { workspace = true } -kvproto = { workspace = true } -keys = { workspace = true } +raftstore = { workspace = true } +slog = { workspace = true } +slog-global = { workspace = true } +tempfile = "3.0" +tikv_util = { workspace = true } +txn_types = { workspace = true } [dev-dependencies] +fail = { version = "0.5", features = ["failpoints"] } tempfile = "3.0" test_util = { workspace = true } -fail = { version = "0.5", features = ["failpoints"] } diff --git a/components/in_memory_engine/Cargo.toml b/components/in_memory_engine/Cargo.toml index a29ad0d6daf..00052d4542d 100644 --- a/components/in_memory_engine/Cargo.toml +++ b/components/in_memory_engine/Cargo.toml @@ -20,44 +20,44 @@ path = "benches/load_region.rs" harness = false [dependencies] -engine_traits = { workspace = true } -collections = { workspace = true } -crossbeam-skiplist = { workspace = true } bytes = "1.0" +collections = { workspace = true } crossbeam = { workspace = true } +crossbeam-skiplist = { workspace = true } +dashmap = "5.1" +engine_rocks = { workspace = true } +engine_traits = { workspace = true } +fail = "0.5" futures = { version = "0.3", features = ["compat"] } -tikv_util = { workspace = true } -txn_types = { workspace = true } +hex = "0.4" +keys = { workspace = true } kvproto = { workspace = true } +lazy_static = "1.4.0" +libc = "0.2" log_wrappers = { workspace = true } +online_config = { workspace = true } +parking_lot = "0.12" pd_client = { workspace = true } +prometheus = { version = "0.13", default-features = false, features = ["nightly"] } +prometheus-static-metric = "0.5" raftstore = { workspace = true } -dashmap = "5.1" +rand = "0.8" security = { workspace = true } serde = "1.0" serde_json = "1.0" -slog-global = { workspace = true } slog = { workspace = true } +slog-global = { workspace = true } +smallvec = "1.4" strum = { version = "0.20", features = ["derive"] } -engine_rocks = { workspace = true } -fail = "0.5" -yatp = { workspace = true } -parking_lot = "0.12" -keys = { workspace = true } -prometheus = { version = "0.13", default-features = false, features = ["nightly"] } -prometheus-static-metric = "0.5" -lazy_static = "1.4.0" -hex = "0.4" thiserror = "1.0" -online_config = { workspace = true } -libc = "0.2" -rand = "0.8" +tikv_util = { workspace = true } tokio = { version = "1.5", features = ["rt-multi-thread"] } -smallvec = "1.4" +txn_types = { workspace = true } +yatp = { workspace = true } [dev-dependencies] criterion = "0.3" +proptest = "1.0.0" tempfile = "3.0" test_pd = { workspace = true } test_util = { workspace = true } -proptest = "1.0.0" diff --git a/components/in_memory_engine/src/region_label.rs b/components/in_memory_engine/src/region_label.rs index c6e643beb53..41fb8f5f6fa 100644 --- a/components/in_memory_engine/src/region_label.rs +++ b/components/in_memory_engine/src/region_label.rs @@ -15,7 +15,7 @@ use pd_client::{ Error as PdError, PdClient, RpcClient, REGION_LABEL_PATH_PREFIX, }; use serde::{Deserialize, Serialize}; -use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE}; +use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE, warn}; /// RegionLabel is the label of a region. This struct is partially copied from /// https://github.com/tikv/pd/blob/783d060861cef37c38cbdcab9777fe95c17907fe/server/schedule/labeler/rules.go#L31. @@ -239,7 +239,7 @@ impl RegionLabelService { }); } Err(PdError::DataCompacted(msg)) => { - error!("ime required revision has been compacted"; "err" => ?msg); + warn!("ime required revision has been compacted"; "err" => ?msg); self.reload_all_region_labels().await; cancel.abort(); continue 'outer; diff --git a/components/pd_client/src/client.rs b/components/pd_client/src/client.rs index 4cdab7c9364..39154207666 100644 --- a/components/pd_client/src/client.rs +++ b/components/pd_client/src/client.rs @@ -652,7 +652,7 @@ impl PdClient for RpcClient { info!("cancel region heartbeat sender"); } Err(e) => { - error!(?e; "failed to send heartbeat"); + warn!("failed to send heartbeat"; "err" => ?e); } }; }); diff --git a/components/pd_client/src/util.rs b/components/pd_client/src/util.rs index 1ac1d80321b..4eafd486c54 100644 --- a/components/pd_client/src/util.rs +++ b/components/pd_client/src/util.rs @@ -494,7 +494,7 @@ where Err(err) => { // these errors are not caused by network, no need to retry if err.retryable() && self.remain_request_count > 0 { - error!(?*err; "request failed, retry"); + warn!("request failed, retry"; "err" => ?*err); false } else { true @@ -550,7 +550,7 @@ where return Ok(r); } Err(e) => { - error!(?e; "request failed"); + warn!("request failed"; "err" => ?e); if retry == 0 { return Err(e); } @@ -559,7 +559,7 @@ where // try reconnect retry -= 1; if let Err(e) = block_on(client.reconnect(true)) { - error!(?e; "reconnect failed"); + warn!("reconnect failed"; "err" => ?e); thread::sleep(REQUEST_RECONNECT_INTERVAL); } } @@ -718,7 +718,7 @@ impl PdConnector { } } Err(e) => { - error!("connect failed"; "endpoints" => ep, "error" => ?e); + warn!("connect failed"; "endpoints" => ep, "error" => ?e); continue; } } diff --git a/components/raft_log_engine/Cargo.toml b/components/raft_log_engine/Cargo.toml index c1c48988f44..15f2388b460 100644 --- a/components/raft_log_engine/Cargo.toml +++ b/components/raft_log_engine/Cargo.toml @@ -9,9 +9,9 @@ license = "Apache-2.0" failpoints = ["raft-engine/failpoints"] [dependencies] +codec = { workspace = true } encryption = { workspace = true } engine_traits = { workspace = true } -codec = { workspace = true } file_system = { workspace = true } kvproto = { workspace = true } raft = { workspace = true } diff --git a/components/raftstore-v2/src/operation/command/write/ingest.rs b/components/raftstore-v2/src/operation/command/write/ingest.rs index 147bd83312f..48f15b3615d 100644 --- a/components/raftstore-v2/src/operation/command/write/ingest.rs +++ b/components/raftstore-v2/src/operation/command/write/ingest.rs @@ -9,7 +9,7 @@ use raftstore::{ store::{check_sst_for_ingestion, metrics::PEER_WRITE_CMD_COUNTER, util}, Result, }; -use slog::{error, info}; +use slog::{error, info, warn}; use sst_importer::range_overlaps; use tikv_util::{box_try, slog_panic}; @@ -25,7 +25,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> { #[inline] pub fn on_cleanup_import_sst(&mut self) { if let Err(e) = self.fsm.store.on_cleanup_import_sst(self.store_ctx) { - error!(self.fsm.store.logger(), "cleanup import sst failed"; "error" => ?e); + warn!(self.fsm.store.logger(), "cleanup import sst failed"; "error" => ?e); } self.schedule_tick( StoreTick::CleanupImportSst, diff --git a/components/raftstore-v2/src/operation/misc.rs b/components/raftstore-v2/src/operation/misc.rs index 0509722ebb3..535f49592ef 100644 --- a/components/raftstore-v2/src/operation/misc.rs +++ b/components/raftstore-v2/src/operation/misc.rs @@ -12,7 +12,7 @@ use raftstore::{ store::{CompactThreshold, TabletSnapKey}, Result, }; -use slog::{debug, error, info}; +use slog::{debug, error, info, warn}; use crate::{ batch::StoreContext, @@ -117,7 +117,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> { #[inline] pub fn on_snapshot_gc(&mut self) { if let Err(e) = self.fsm.store.on_snapshot_gc(self.store_ctx) { - error!(self.fsm.store.logger(), "cleanup import sst failed"; "error" => ?e); + warn!(self.fsm.store.logger(), "cleanup import sst failed"; "error" => ?e); } self.schedule_tick( StoreTick::SnapGc, diff --git a/components/raftstore-v2/src/worker/pd/mod.rs b/components/raftstore-v2/src/worker/pd/mod.rs index 3ae31083d9f..fdfe7507983 100644 --- a/components/raftstore-v2/src/worker/pd/mod.rs +++ b/components/raftstore-v2/src/worker/pd/mod.rs @@ -523,7 +523,7 @@ mod requests { None => PeerMsg::admin_command(req).0, }; if let Err(e) = router.send(region_id, msg) { - error!( + warn!( logger, "send request failed"; "region_id" => region_id, "cmd_type" => ?cmd_type, "err" => ?e, diff --git a/components/raftstore-v2/src/worker/pd/store.rs b/components/raftstore-v2/src/worker/pd/store.rs index 226fef08d11..d6fb6b71b65 100644 --- a/components/raftstore-v2/src/worker/pd/store.rs +++ b/components/raftstore-v2/src/worker/pd/store.rs @@ -370,7 +370,7 @@ where } } Err(e) => { - error!(logger, "store heartbeat failed"; "err" => ?e); + warn!(logger, "store heartbeat failed"; "err" => ?e); } } }; diff --git a/components/raftstore/src/compacted_event_sender.rs b/components/raftstore/src/compacted_event_sender.rs index 736332b52c5..b984dac2fd9 100644 --- a/components/raftstore/src/compacted_event_sender.rs +++ b/components/raftstore/src/compacted_event_sender.rs @@ -3,7 +3,7 @@ use std::sync::Mutex; use engine_rocks::{CompactedEventSender, RocksCompactedEvent}; use engine_traits::{KvEngine, RaftEngine}; -use tikv_util::error_unknown; +use tikv_util::warn; use crate::store::{fsm::store::RaftRouter, StoreMsg}; @@ -25,7 +25,10 @@ where let router = self.router.lock().unwrap(); let event = StoreMsg::CompactedEvent(event); if let Err(e) = router.send_control(event) { - error_unknown!(?e; "send compaction finished event to raftstore failed"); + warn!( + "send compaction finished event to raftstore failed"; + "err" => ?e, + ); } } } diff --git a/components/raftstore/src/coprocessor/split_observer.rs b/components/raftstore/src/coprocessor/split_observer.rs index e84058d41dc..8b8015ff5da 100644 --- a/components/raftstore/src/coprocessor/split_observer.rs +++ b/components/raftstore/src/coprocessor/split_observer.rs @@ -5,7 +5,7 @@ use kvproto::{ metapb::Region, raft_cmdpb::{AdminCmdType, AdminRequest, SplitRequest}, }; -use tikv_util::{box_err, box_try, codec::bytes, error, warn}; +use tikv_util::{box_err, box_try, codec::bytes, warn}; use super::{AdminObserver, Coprocessor, ObserverContext, Result as CopResult}; use crate::{store::util, Error}; @@ -124,7 +124,7 @@ impl AdminObserver for SplitObserver { } let mut request = vec![req.take_split()]; if let Err(e) = self.on_split(ctx, &mut request) { - error!( + warn!( "failed to handle split req"; "region_id" => ctx.region().get_id(), "err" => ?e, @@ -145,7 +145,7 @@ impl AdminObserver for SplitObserver { } let mut requests = req.mut_splits().take_requests().into(); if let Err(e) = self.on_split(ctx, &mut requests) { - error!( + warn!( "failed to handle split req"; "region_id" => ctx.region().get_id(), "err" => ?e, diff --git a/components/raftstore/src/store/entry_storage.rs b/components/raftstore/src/store/entry_storage.rs index a09c3475e1a..eab14725874 100644 --- a/components/raftstore/src/store/entry_storage.rs +++ b/components/raftstore/src/store/entry_storage.rs @@ -1140,7 +1140,7 @@ impl EntryStorage { Ok(_) => { // This should not happen, but it's OK :) debug_assert!(false, "entries should not have been fetched"); - error!("entries are fetched unexpectedly during warming up"); + warn!("entries are fetched unexpectedly during warming up"); None } Err(raft::Error::Store(raft::StorageError::LogTemporarilyUnavailable)) => { @@ -1190,7 +1190,7 @@ impl EntryStorage { // FIXME: the assertion below doesn't hold. // assert!(is_valid, "the warmup range should still be valid"); if !is_valid { - error!( + warn!( "unexpected warmup state"; "region_id" => self.region_id, "peer_id" => self.peer_id, diff --git a/components/raftstore/src/store/fsm/peer.rs b/components/raftstore/src/store/fsm/peer.rs index 5f5a9f6b773..bfccfb0fc69 100644 --- a/components/raftstore/src/store/fsm/peer.rs +++ b/components/raftstore/src/store/fsm/peer.rs @@ -647,10 +647,10 @@ where if !self.ctx.coprocessor_host.on_raft_message(&msg.msg) { continue; } - if let Err(e) = self.on_raft_message(msg) { - error!(%e; + warn!( "handle raft message err"; + "err" => ?e, "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), ); @@ -2227,7 +2227,7 @@ where Some(mb) => mb, None => { self.fsm.tick_registry[idx] = false; - error!( + warn!( "failed to get mailbox"; "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), @@ -3174,7 +3174,7 @@ where } if !msg.has_region_epoch() { - error!( + warn!( "missing epoch in raft message, ignore it"; "region_id" => region_id, ); @@ -4082,7 +4082,7 @@ where ); let task = PdTask::DestroyPeer { region_id }; if let Err(e) = self.ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd"; "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), @@ -4450,7 +4450,7 @@ where regions: regions.to_vec(), }; if let Err(e) = self.ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd"; "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), @@ -6320,7 +6320,7 @@ where callback: cb, }; if let Err(ScheduleError::Stopped(t)) = self.ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd to split: Stopped"; "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), @@ -6775,7 +6775,7 @@ where region: self.fsm.peer.region().clone(), }; if let Err(e) = self.ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd"; "region_id" => self.fsm.region_id(), "peer_id" => self.fsm.peer_id(), diff --git a/components/raftstore/src/store/fsm/store.rs b/components/raftstore/src/store/fsm/store.rs index 8da5743fecb..dcccb97ea25 100644 --- a/components/raftstore/src/store/fsm/store.rs +++ b/components/raftstore/src/store/fsm/store.rs @@ -733,8 +733,9 @@ where gc_msg.set_is_tombstone(true); } if let Err(e) = self.trans.send(gc_msg) { - error!(?e; + warn!( "send gc message failed"; + "err" => ?e, "region_id" => region_id, "to_peer_id" => ?from_peer.get_id(), "to_peer_store_id" => ?from_peer.get_store_id(), @@ -2107,8 +2108,9 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER extra_msg.set_type(ExtraMessageType::MsgCheckStalePeerResponse); extra_msg.set_check_peers(region.get_peers().into()); if let Err(e) = self.ctx.trans.send(send_msg) { - error!(?e; + warn!( "send check stale peer response message failed"; + "err" => ?e, "region_id" => region_id, ); } @@ -2189,7 +2191,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER } if !msg.has_region_epoch() { - error!( + warn!( "missing epoch in raft message, ignore it"; "region_id" => region_id, ); @@ -3208,9 +3210,10 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER fn on_cleanup_import_sst_tick(&mut self) { if let Err(e) = self.on_cleanup_import_sst() { - error!(?e; + warn!( "cleanup import sst failed"; "store_id" => self.fsm.store.id, + "err" => ?e, ); } self.register_cleanup_import_sst_tick(); diff --git a/components/raftstore/src/store/peer.rs b/components/raftstore/src/store/peer.rs index 0f4f25950ff..3108bd841b2 100644 --- a/components/raftstore/src/store/peer.rs +++ b/components/raftstore/src/store/peer.rs @@ -4149,7 +4149,7 @@ where region_id: self.region_id, }; if let Err(e) = poll_ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd"; "region_id" => self.region_id, "peer_id" => self.peer_id(), @@ -5620,7 +5620,7 @@ where wait_data_peers: self.wait_data_peers.clone(), }); if let Err(e) = ctx.pd_scheduler.schedule(task) { - error!( + warn!( "failed to notify pd"; "region_id" => self.region_id, "peer_id" => self.peer.get_id(), @@ -5657,8 +5657,9 @@ where send_msg.set_extra_msg(msg); send_msg.set_to_peer(to.clone()); if let Err(e) = trans.send(send_msg) { - error!(?e; + warn!( "failed to send extra message"; + "err" => ?e, "type" => ?ty, "region_id" => self.region_id, "peer_id" => self.peer.get_id(), diff --git a/components/raftstore/src/store/worker/cleanup_snapshot.rs b/components/raftstore/src/store/worker/cleanup_snapshot.rs index 78167a726d2..51a989147bb 100644 --- a/components/raftstore/src/store/worker/cleanup_snapshot.rs +++ b/components/raftstore/src/store/worker/cleanup_snapshot.rs @@ -148,7 +148,10 @@ where let msg = StoreMsg::GcSnapshotFinish; if let Err(e) = StoreRouter::send(&self.router, msg) { - error!(%e; "send StoreMsg::GcSnapshotFinish failed"); + warn!( + "send StoreMsg::GcSnapshotFinish failed, are we shutting down?"; + "err" => ?e, + ); } } Task::DeleteSnapshotFiles { diff --git a/components/raftstore/src/store/worker/pd.rs b/components/raftstore/src/store/worker/pd.rs index 4f4d6b85034..cc6d096b6cb 100644 --- a/components/raftstore/src/store/worker/pd.rs +++ b/components/raftstore/src/store/worker/pd.rs @@ -1462,7 +1462,7 @@ where .inc(); } Err(e) => { - error!("get region failed"; "err" => ?e); + warn!("get region failed"; "err" => ?e); } } }; @@ -2003,7 +2003,7 @@ where cb: Callback::None, }); if let Err(e) = router.send(region_id, PeerMsg::CasualMessage(msg)) { - error!("send auto half split request failed"; + warn!("send auto half split request failed"; "region_id" => region_id, "start_key" => log_wrappers::Value::key(&start_key), "end_key" => log_wrappers::Value::key(&end_key), diff --git a/components/raftstore/src/store/worker/region.rs b/components/raftstore/src/store/worker/region.rs index 4af19c53035..e5331d6b826 100644 --- a/components/raftstore/src/store/worker/region.rs +++ b/components/raftstore/src/store/worker/region.rs @@ -693,7 +693,7 @@ where }) .unwrap(); if let Err(e) = self.delete_all_in_range(&ranges) { - error!("failed to cleanup stale range"; "err" => %e); + warn!("failed to cleanup stale range"; "err" => %e); return; } self.engine diff --git a/components/resource_control/src/service.rs b/components/resource_control/src/service.rs index 0436ce71747..87152c3a4d9 100644 --- a/components/resource_control/src/service.rs +++ b/components/resource_control/src/service.rs @@ -17,7 +17,7 @@ use pd_client::{ RESOURCE_CONTROL_CONTROLLER_CONFIG_PATH, }; use serde::{Deserialize, Serialize}; -use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE}; +use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE, warn}; use crate::{resource_limiter::ResourceType, ResourceGroupManager}; @@ -88,7 +88,7 @@ impl ResourceManagerService { }}); } Err(PdError::DataCompacted(msg)) => { - error!("required revision has been compacted"; "err" => ?msg); + warn!("required revision has been compacted"; "err" => ?msg); self.reload_all_resource_groups().await; cancel.abort(); continue 'outer; diff --git a/components/sst_importer/src/sst_importer.rs b/components/sst_importer/src/sst_importer.rs index e3047d59ae1..07a10d5a9f9 100644 --- a/components/sst_importer/src/sst_importer.rs +++ b/components/sst_importer/src/sst_importer.rs @@ -415,7 +415,12 @@ impl SstImporter { Ok(r) } Err(e) => { - error!(%e; "download failed"; "meta" => ?meta, "name" => name,); + warn!( + "download failed"; + "meta" => ?meta, + "name" => name, + "err" => ?e, + ); Err(e) } } diff --git a/src/server/gc_worker/gc_manager.rs b/src/server/gc_worker/gc_manager.rs index d0d0d295f9a..524840582a7 100644 --- a/src/server/gc_worker/gc_manager.rs +++ b/src/server/gc_worker/gc_manager.rs @@ -633,7 +633,10 @@ impl GcMan ); if let Err(e) = res { - error!(?e; "gc_worker: failed to get next region information"); + warn!( + "gc_worker: failed to get next region information"; + "err" => ?e + ); return (None, None); }; diff --git a/src/server/raft_client.rs b/src/server/raft_client.rs index 83373103c54..6e328fb70d5 100644 --- a/src/server/raft_client.rs +++ b/src/server/raft_client.rs @@ -582,7 +582,13 @@ where } let (sink_err, recv_err) = (res.0.err(), res.1.err()); - error!("connection aborted"; "store_id" => self.store_id, "sink_error" => ?sink_err, "receiver_err" => ?recv_err, "addr" => %self.sender.addr); + warn!( + "connection aborted"; + "store_id" => self.store_id, + "sink_error" => ?sink_err, + "receiver_err" => ?recv_err, + "addr" => %self.sender.addr, + ); if let Some(tx) = self.lifetime.take() { let should_fallback = [sink_err, recv_err] .iter() @@ -857,7 +863,7 @@ async fn start( debug!("connecting to store"; "store_id" => back_end.store_id, "addr" => %addr); if !channel.wait_for_connected(backoff_duration).await { - error!("wait connect timeout"; "store_id" => back_end.store_id, "addr" => addr); + warn!("wait connect timeout"; "store_id" => back_end.store_id, "addr" => addr); // Clears pending messages to avoid consuming high memory when one node is // shutdown. @@ -901,7 +907,7 @@ async fn start( } // Err(_) should be tx is dropped Ok(RaftCallRes::Disconnected) | Err(_) => { - error!("connection abort"; "store_id" => back_end.store_id, "addr" => addr); + warn!("connection abort"; "store_id" => back_end.store_id, "addr" => addr); REPORT_FAILURE_MSG_COUNTER .with_label_values(&["unreachable", &back_end.store_id.to_string()]) .inc_by(1); diff --git a/src/server/raft_server.rs b/src/server/raft_server.rs index 36c0cab22fc..7354141bc46 100644 --- a/src/server/raft_server.rs +++ b/src/server/raft_server.rs @@ -423,7 +423,7 @@ where } }, // TODO: should we clean region for other errors too? - Err(e) => error!(?e; "bootstrap cluster"; "cluster_id" => self.cluster_id,), + Err(e) => warn!("bootstrap cluster"; "cluster_id" => self.cluster_id, "err" => ?e), } retry += 1; thread::sleep(CHECK_CLUSTER_BOOTSTRAPPED_RETRY_INTERVAL); diff --git a/src/server/raftkv/raft_extension.rs b/src/server/raftkv/raft_extension.rs index 6605115e481..d4b1a1e8eec 100644 --- a/src/server/raftkv/raft_extension.rs +++ b/src/server/raftkv/raft_extension.rs @@ -95,8 +95,9 @@ where .router .report_snapshot_status(region_id, to_peer_id, status) { - error!(?e; - "report snapshot to peer failes"; + warn!( + "report snapshot to peer fails"; + "err" => ?e, "to_peer_id" => to_peer_id, "status" => ?status, "region_id" => region_id, diff --git a/src/server/service/batch.rs b/src/server/service/batch.rs index 7a67fb11592..72d708e8de5 100644 --- a/src/server/service/batch.rs +++ b/src/server/service/batch.rs @@ -194,7 +194,7 @@ impl ResponseBatchConsumer<(Option>, Statistics)> for GetCommandResponse ); let task = MeasuredSingleResponse::new(id, res, measure, None); if self.tx.send_with(task, WakePolicy::Immediately).is_err() { - error!("KvService response batch commands fail"); + warn!("KvService response batch commands fail"); } } } @@ -230,7 +230,7 @@ impl ResponseBatchConsumer>> for GetCommandResponseConsumer { ); let task = MeasuredSingleResponse::new(id, res, measure, None); if self.tx.send_with(task, WakePolicy::Immediately).is_err() { - error!("KvService response batch commands fail"); + warn!("KvService response batch commands fail"); } } } @@ -289,7 +289,7 @@ fn future_batch_get_command( ); let task = MeasuredSingleResponse::new(id, res, measure, None); if tx.send_with(task, WakePolicy::Immediately).is_err() { - error!("KvService response batch commands fail"); + warn!("KvService response batch commands fail"); } } } @@ -345,7 +345,7 @@ fn future_batch_raw_get_command( ); let task = MeasuredSingleResponse::new(id, res, measure, None); if tx.send_with(task, WakePolicy::Immediately).is_err() { - error!("KvService response batch commands fail"); + warn!("KvService response batch commands fail"); } } } diff --git a/src/server/service/debug.rs b/src/server/service/debug.rs index 497d8240684..41401199487 100644 --- a/src/server/service/debug.rs +++ b/src/server/service/debug.rs @@ -31,7 +31,7 @@ fn error_to_status(e: Error) -> RpcStatus { } fn on_grpc_error(tag: &'static str, e: &GrpcError) { - error!("{} failed: {:?}", tag, e); + warn!("{} failed: {:?}", tag, e); } fn error_to_grpc_error(tag: &'static str, e: Error) -> GrpcError { diff --git a/src/server/service/kv.rs b/src/server/service/kv.rs index be895af869a..2313994065e 100644 --- a/src/server/service/kv.rs +++ b/src/server/service/kv.rs @@ -778,7 +778,7 @@ impl Tikv for Service { let status = match res.await { Err(e) => { let msg = format!("{:?}", e); - error!("dispatch raft msg from gRPC to raftstore fail"; "err" => %msg); + warn!("dispatch raft msg from gRPC to raftstore fail"; "err" => %msg); RpcStatus::with_message(RpcStatusCode::UNKNOWN, msg) } Ok(_) => RpcStatus::new(RpcStatusCode::UNKNOWN), @@ -836,14 +836,14 @@ impl Tikv for Service { Err(e) => { fail_point!("on_batch_raft_stream_drop_by_err"); let msg = format!("{:?}", e); - error!("dispatch raft msg from gRPC to raftstore fail"; "err" => %msg); + warn!("dispatch raft msg from gRPC to raftstore fail"; "err" => %msg); RpcStatus::with_message(RpcStatusCode::UNKNOWN, msg) } Ok(_) => RpcStatus::new(RpcStatusCode::UNKNOWN), }; let _ = sink .fail(status) - .map_err(|e| error!("KvService::batch_raft send response fail"; "err" => ?e)) + .map_err(|e| warn!("KvService::batch_raft send response fail"; "err" => ?e)) .await; }); } @@ -1034,7 +1034,7 @@ impl Tikv for Service { } future::ok(()) }); - ctx.spawn(request_handler.unwrap_or_else(|e| error!("batch_commands error"; "err" => %e))); + ctx.spawn(request_handler.unwrap_or_else(|e| warn!("batch_commands error"; "err" => %e))); let grpc_thread_load = Arc::clone(&self.grpc_thread_load); let response_retriever = BatchReceiver::new( @@ -1261,13 +1261,13 @@ fn response_batch_commands_request( Ok(resp) => { let task = MeasuredSingleResponse::new(id, resp, measure, None); if let Err(e) = tx.send_with(task, WakePolicy::Immediately) { - error!("KvService response batch commands fail"; "err" => ?e); + warn!("KvService response batch commands fail"; "err" => ?e); } } Err(server_err @ Error::ClusterIDMisMatch { .. }) => { let task = MeasuredSingleResponse::new(id, T::default(), measure, Some(server_err)); if let Err(e) = tx.send_with(task, WakePolicy::Immediately) { - error!("KvService response batch commands fail"; "err" => ?e); + warn!("KvService response batch commands fail"; "err" => ?e); } } _ => {} diff --git a/src/server/snap.rs b/src/server/snap.rs index 0238bd2ef75..3558f9b8875 100644 --- a/src/server/snap.rs +++ b/src/server/snap.rs @@ -530,7 +530,7 @@ impl Runnable for Runner { let result = recv_snap(stream, sink, snap_mgr, raft_router).await; recving_count.fetch_sub(1, Ordering::SeqCst); if let Err(e) = result { - error!("failed to recv snapshot"; "err" => %e); + warn!("failed to recv snapshot"; "err" => %e); } }; self.pool.spawn(task); @@ -573,7 +573,7 @@ impl Runnable for Runner { .await; recving_count.fetch_sub(1, Ordering::SeqCst); if let Err(e) = result { - error!("failed to recv snapshot"; "err" => %e); + warn!("failed to recv snapshot"; "err" => %e); } }; self.pool.spawn(task); @@ -615,7 +615,7 @@ impl Runnable for Runner { cb(Ok(())); } Err(e) => { - error!("failed to send snap"; "to_addr" => addr, "region_id" => region_id, "err" => ?e); + warn!("failed to send snap"; "to_addr" => addr, "region_id" => region_id, "err" => ?e); cb(Err(e)); } }; diff --git a/src/server/tablet_snap.rs b/src/server/tablet_snap.rs index 7f5178d6b27..60d1fa82114 100644 --- a/src/server/tablet_snap.rs +++ b/src/server/tablet_snap.rs @@ -932,7 +932,7 @@ where .await; recving_count.fetch_sub(1, Ordering::SeqCst); if let Err(e) = result { - error!("failed to recv snapshot"; "err" => %e); + warn!("failed to recv snapshot"; "err" => %e); } }); } @@ -987,7 +987,7 @@ where cb(Ok(())); } Err(e) => { - error!("failed to send snap"; "to_addr" => addr, "region_id" => region_id, "err" => ?e); + warn!("failed to send snap"; "to_addr" => addr, "region_id" => region_id, "err" => ?e); cb(Err(e)); } }; From 3008e1e794c447f55f659c0aff00df7278f923ed Mon Sep 17 00:00:00 2001 From: JaySon-Huang Date: Mon, 22 Sep 2025 10:38:43 +0800 Subject: [PATCH 2/2] Fix cargo sort Signed-off-by: JaySon-Huang --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d2fc1230696..80e388c81b0 100644 --- a/Makefile +++ b/Makefile @@ -226,7 +226,8 @@ unset-override: pre-format: unset-override @rustup component add rustfmt - @cargo install --force --locked -q cargo-sort + @cargo install cargo-sort --version 1.0.9 + #@cargo install --force --locked -q cargo-sort pre-format-fast: unset-override @rustup component add rustfmt