From 418090b4647e5e2d9bc248f940f387070c8479a9 Mon Sep 17 00:00:00 2001 From: Jeremyhi Date: Wed, 22 May 2024 20:17:20 +0800 Subject: [PATCH] chore: log error for detail (#4011) * chore: log error for detail * chore: by cr --- src/cmd/src/lib.rs | 2 +- src/datanode/src/heartbeat.rs | 17 +++++++---------- src/frontend/src/heartbeat.rs | 2 +- src/meta-srv/src/cluster.rs | 4 ++-- src/meta-srv/src/election/etcd.rs | 2 +- .../src/handler/collect_stats_handler.rs | 2 +- .../src/handler/failure_handler/runner.rs | 4 ++-- src/meta-srv/src/handler/keep_lease_handler.rs | 2 +- src/meta-srv/src/metasrv.rs | 6 +++--- src/mito2/src/region/opener.rs | 6 +++--- src/script/src/table.rs | 2 +- src/servers/src/error.rs | 2 +- src/servers/src/grpc/flight/stream.rs | 6 +++--- src/servers/src/http/authorize.rs | 4 ++-- src/servers/src/mysql/handler.rs | 2 +- src/servers/src/mysql/server.rs | 4 ++-- src/servers/src/postgres/server.rs | 2 +- src/servers/src/server.rs | 2 +- src/table/src/predicate.rs | 4 ++-- 19 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/cmd/src/lib.rs b/src/cmd/src/lib.rs index 6444364c10..f9f9e69965 100644 --- a/src/cmd/src/lib.rs +++ b/src/cmd/src/lib.rs @@ -59,7 +59,7 @@ pub trait App: Send { if self.wait_signal() { if let Err(e) = tokio::signal::ctrl_c().await { - error!("Failed to listen for ctrl-c signal: {}", e); + error!(e; "Failed to listen for ctrl-c signal"); // It's unusual to fail to listen for ctrl-c signal, maybe there's something unexpected in // the underlying system. So we stop the app instead of running nonetheless to let people // investigate the issue. diff --git a/src/datanode/src/heartbeat.rs b/src/datanode/src/heartbeat.rs index eeb0cd1e99..b1cdd61859 100644 --- a/src/datanode/src/heartbeat.rs +++ b/src/datanode/src/heartbeat.rs @@ -109,13 +109,10 @@ impl HeartbeatTask { let mut last_received_lease = Instant::now(); let _handle = common_runtime::spawn_bg(async move { - while let Some(res) = match rx.message().await { - Ok(m) => m, - Err(e) => { - error!(e; "Error while reading heartbeat response"); - None - } - } { + while let Some(res) = rx.message().await.unwrap_or_else(|e| { + error!(e; "Error while reading heartbeat response"); + None + }) { if let Some(msg) = res.mailbox_message.as_ref() { info!("Received mailbox message: {msg:?}, meta_client id: {client_id:?}"); } @@ -238,7 +235,7 @@ impl HeartbeatTask { Some(req) } Err(e) => { - error!(e;"Failed to encode mailbox messages!"); + error!(e; "Failed to encode mailbox messages!"); None } } @@ -276,7 +273,7 @@ impl HeartbeatTask { if let Some(req) = req { debug!("Sending heartbeat request: {:?}", req); if let Err(e) = tx.send(req).await { - error!("Failed to send heartbeat to metasrv, error: {:?}", e); + error!(e; "Failed to send heartbeat to metasrv"); match Self::create_streams( &meta_client, running.clone(), @@ -301,7 +298,7 @@ impl HeartbeatTask { Instant::now() + Duration::from_secs(META_KEEP_ALIVE_INTERVAL_SECS), ); - error!(e;"Failed to reconnect to metasrv!"); + error!(e; "Failed to reconnect to metasrv!"); } } } diff --git a/src/frontend/src/heartbeat.rs b/src/frontend/src/heartbeat.rs index d2c3431501..3e744fb7bc 100644 --- a/src/frontend/src/heartbeat.rs +++ b/src/frontend/src/heartbeat.rs @@ -151,7 +151,7 @@ impl HeartbeatTask { Some(req) } Err(e) => { - error!(e;"Failed to encode mailbox messages!"); + error!(e; "Failed to encode mailbox messages"); None } } diff --git a/src/meta-srv/src/cluster.rs b/src/meta-srv/src/cluster.rs index 0c8def1c0c..f7f7fac277 100644 --- a/src/meta-srv/src/cluster.rs +++ b/src/meta-srv/src/cluster.rs @@ -89,7 +89,7 @@ impl KvBackend for MetaPeerClient { Ok(res) => return Ok(res), Err(e) => { if need_retry(&e) { - warn!("Encountered an error that need to retry, err: {:?}", e); + warn!(e; "Encountered an error that need to retry"); tokio::time::sleep(Duration::from_millis(retry_interval_ms)).await; } else { return Err(e); @@ -138,7 +138,7 @@ impl KvBackend for MetaPeerClient { Ok(res) => return Ok(res), Err(e) => { if need_retry(&e) { - warn!("Encountered an error that need to retry, err: {:?}", e); + warn!(e; "Encountered an error that need to retry"); tokio::time::sleep(Duration::from_millis(retry_interval_ms)).await; } else { return Err(e); diff --git a/src/meta-srv/src/election/etcd.rs b/src/meta-srv/src/election/etcd.rs index 1cc72ace2e..49dbfc7c89 100644 --- a/src/meta-srv/src/election/etcd.rs +++ b/src/meta-srv/src/election/etcd.rs @@ -251,7 +251,7 @@ impl Election for EtcdElection { .leader_watcher .send(LeaderChangeMessage::Elected(Arc::new(leader.clone()))) { - error!("Failed to send leader change message, error: {e}"); + error!(e; "Failed to send leader change message"); } } } else { diff --git a/src/meta-srv/src/handler/collect_stats_handler.rs b/src/meta-srv/src/handler/collect_stats_handler.rs index 4e59a81b24..d68f1e3b38 100644 --- a/src/meta-srv/src/handler/collect_stats_handler.rs +++ b/src/meta-srv/src/handler/collect_stats_handler.rs @@ -45,7 +45,7 @@ impl HeartbeatHandler for CollectStatsHandler { let _ = acc.stat.insert(stat); } Err(err) => { - warn!("Incomplete heartbeat data: {:?}, err: {:?}", req, err); + warn!(err; "Incomplete heartbeat data: {:?}", req); } }; diff --git a/src/meta-srv/src/handler/failure_handler/runner.rs b/src/meta-srv/src/handler/failure_handler/runner.rs index 39eb2665c1..313a02f253 100644 --- a/src/meta-srv/src/handler/failure_handler/runner.rs +++ b/src/meta-srv/src/handler/failure_handler/runner.rs @@ -75,13 +75,13 @@ impl FailureDetectRunner { pub(crate) async fn send_heartbeat(&self, heartbeat: DatanodeHeartbeat) { if let Err(e) = self.heartbeat_tx.send(heartbeat).await { - error!("FailureDetectRunner is stop receiving heartbeats: {}", e) + error!(e; "FailureDetectRunner is stop receiving heartbeats") } } pub(crate) async fn send_control(&self, control: FailureDetectControl) { if let Err(e) = self.control_tx.send(control).await { - error!("FailureDetectRunner is stop receiving controls: {}", e) + error!(e; "FailureDetectRunner is stop receiving controls") } } diff --git a/src/meta-srv/src/handler/keep_lease_handler.rs b/src/meta-srv/src/handler/keep_lease_handler.rs index 64dfeff698..82f2aad206 100644 --- a/src/meta-srv/src/handler/keep_lease_handler.rs +++ b/src/meta-srv/src/handler/keep_lease_handler.rs @@ -67,7 +67,7 @@ impl HeartbeatHandler for KeepLeaseHandler { let res = ctx.in_memory.put(put_req).await; if let Err(err) = res { - warn!("Failed to update lease KV, peer: {peer:?}, {err}"); + warn!(err; "Failed to update lease KV, peer: {peer:?}"); } Ok(HandleControl::Continue) diff --git a/src/meta-srv/src/metasrv.rs b/src/meta-srv/src/metasrv.rs index fb5b302e03..76fb794f79 100644 --- a/src/meta-srv/src/metasrv.rs +++ b/src/meta-srv/src/metasrv.rs @@ -296,7 +296,7 @@ impl MetaStateHandler { if let Some(sub_manager) = self.subscribe_manager.clone() { info!("Leader changed, un_subscribe all"); if let Err(e) = sub_manager.unsubscribe_all() { - error!("Failed to un_subscribe all, error: {}", e); + error!(e; "Failed to un_subscribe all"); } } } @@ -405,7 +405,7 @@ impl Metasrv { while started.load(Ordering::Relaxed) { let res = election.register_candidate(&node_info).await; if let Err(e) = res { - warn!("Metasrv register candidate error: {}", e); + warn!(e; "Metasrv register candidate error"); } } }); @@ -419,7 +419,7 @@ impl Metasrv { while started.load(Ordering::Relaxed) { let res = election.campaign().await; if let Err(e) = res { - warn!("Metasrv election error: {}", e); + warn!(e; "Metasrv election error"); } info!("Metasrv re-initiate election"); } diff --git a/src/mito2/src/region/opener.rs b/src/mito2/src/region/opener.rs index 2bdeed1c1c..64e333c9c4 100644 --- a/src/mito2/src/region/opener.rs +++ b/src/mito2/src/region/opener.rs @@ -155,9 +155,9 @@ impl RegionOpener { ); } Err(e) => { - warn!( - "Failed to open region {} before creating it, region_dir: {}, err: {}", - self.region_id, self.region_dir, e + warn!(e; + "Failed to open region {} before creating it, region_dir: {}", + self.region_id, self.region_dir ); } } diff --git a/src/script/src/table.rs b/src/script/src/table.rs index 8f998d64eb..5eacf1ff7c 100644 --- a/src/script/src/table.rs +++ b/src/script/src/table.rs @@ -144,7 +144,7 @@ impl ScriptsTable { } Err(err) => { warn!( - r#"Failed to compile script "{}"" in `scripts` table: {}"#, + r#"Failed to compile script "{}"" in `scripts` table: {:?}"#, name, err ); } diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs index 375206d337..7515b767e2 100644 --- a/src/servers/src/error.rs +++ b/src/servers/src/error.rs @@ -791,7 +791,7 @@ impl IntoResponse for Error { if self.status_code().should_log_error() { error!(self; "Failed to handle HTTP request: "); } else { - debug!("Failed to handle HTTP request: {self}"); + debug!("Failed to handle HTTP request: {self:?}"); } HttpStatusCode::INTERNAL_SERVER_ERROR diff --git a/src/servers/src/grpc/flight/stream.rs b/src/servers/src/grpc/flight/stream.rs index 25813f6b0e..038c3371b6 100644 --- a/src/servers/src/grpc/flight/stream.rs +++ b/src/servers/src/grpc/flight/stream.rs @@ -62,7 +62,7 @@ impl FlightRecordBatchStream { ) { let schema = recordbatches.schema(); if let Err(e) = tx.send(Ok(FlightMessage::Schema(schema))).await { - warn!("stop sending Flight data, err: {e}"); + warn!(e; "stop sending Flight data"); return; } @@ -70,14 +70,14 @@ impl FlightRecordBatchStream { match batch_or_err { Ok(recordbatch) => { if let Err(e) = tx.send(Ok(FlightMessage::Recordbatch(recordbatch))).await { - warn!("stop sending Flight data, err: {e}"); + warn!(e; "stop sending Flight data"); return; } } Err(e) => { let e = Err(e).context(error::CollectRecordbatchSnafu); if let Err(e) = tx.send(e.map_err(|x| x.into())).await { - warn!("stop sending Flight data, err: {e}"); + warn!(e; "stop sending Flight data"); } return; } diff --git a/src/servers/src/http/authorize.rs b/src/servers/src/http/authorize.rs index 971fdce57e..c60e4356b5 100644 --- a/src/servers/src/http/authorize.rs +++ b/src/servers/src/http/authorize.rs @@ -84,7 +84,7 @@ pub async fn inner_auth( let (username, password) = match extract_username_and_password(&req) { Ok((username, password)) => (username, password), Err(e) => { - warn!("extract username and password failed: {}", e); + warn!(e; "extract username and password failed"); crate::metrics::METRIC_AUTH_FAILURE .with_label_values(&[e.status_code().as_ref()]) .inc(); @@ -108,7 +108,7 @@ pub async fn inner_auth( Ok(req) } Err(e) => { - warn!("authenticate failed: {}", e); + warn!(e; "authenticate failed"); crate::metrics::METRIC_AUTH_FAILURE .with_label_values(&[e.status_code().as_ref()]) .inc(); diff --git a/src/servers/src/mysql/handler.rs b/src/servers/src/mysql/handler.rs index d0f4372ef1..84a58faeb9 100644 --- a/src/servers/src/mysql/handler.rs +++ b/src/servers/src/mysql/handler.rs @@ -191,7 +191,7 @@ impl AsyncMysqlShim for MysqlInstanceShi METRIC_AUTH_FAILURE .with_label_values(&[e.status_code().as_ref()]) .inc(); - warn!("Failed to auth, err: {:?}", e); + warn!(e; "Failed to auth"); return false; } }; diff --git a/src/servers/src/mysql/server.rs b/src/servers/src/mysql/server.rs index 1301f88c55..d17d0e58d3 100644 --- a/src/servers/src/mysql/server.rs +++ b/src/servers/src/mysql/server.rs @@ -135,7 +135,7 @@ impl MysqlServer { async move { match tcp_stream { - Err(error) => warn!("Broken pipe: {}", error), // IoError doesn't impl ErrorExt. + Err(e) => warn!(e; "Broken pipe"), // IoError doesn't impl ErrorExt. Ok(io_stream) => { if let Err(e) = io_stream.set_nodelay(true) { warn!(e; "Failed to set TCP nodelay"); @@ -143,7 +143,7 @@ impl MysqlServer { if let Err(error) = Self::handle(io_stream, io_runtime, spawn_ref, spawn_config).await { - warn!("Unexpected error when handling TcpStream {}", error); + warn!(error; "Unexpected error when handling TcpStream"); }; } }; diff --git a/src/servers/src/postgres/server.rs b/src/servers/src/postgres/server.rs index 41fd89b1b2..6b397dbb47 100644 --- a/src/servers/src/postgres/server.rs +++ b/src/servers/src/postgres/server.rs @@ -86,7 +86,7 @@ impl PostgresServer { Some(addr) } Err(e) => { - warn!("Failed to get PostgreSQL client addr, err: {}", e); + warn!(e; "Failed to get PostgreSQL client addr"); None } }; diff --git a/src/servers/src/server.rs b/src/servers/src/server.rs index 129141893e..26dfd1ce68 100644 --- a/src/servers/src/server.rs +++ b/src/servers/src/server.rs @@ -125,7 +125,7 @@ impl AcceptTask { if let Err(error) = join_handle.await { // Couldn't use `error!(e; xxx)` because JoinError doesn't implement ErrorExt. error!( - "Unexpected error during shutdown {} server, error: {}", + "Unexpected error during shutdown {} server, error: {:?}", name, error ); } else { diff --git a/src/table/src/predicate.rs b/src/table/src/predicate.rs index a9365004cb..f338e06d7c 100644 --- a/src/table/src/predicate.rs +++ b/src/table/src/predicate.rs @@ -116,11 +116,11 @@ impl Predicate { } } Err(e) => { - warn!("Failed to prune row groups, error: {:?}", e); + warn!(e; "Failed to prune row groups"); } }, Err(e) => { - error!("Failed to create predicate for expr, error: {:?}", e); + error!(e; "Failed to create predicate for expr"); } } }