fix: add missing error display message

Signed-off-by: Ruihang Xia <[email protected]>
GreptimeTeam · Nov 22, 2023 · e36c2ff · e36c2ff
1 parent 4c76d4d
commit e36c2ff
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 70 deletions.
diff --git a/src/catalog/src/error.rs b/src/catalog/src/error.rs
@@ -180,7 +180,7 @@ pub enum Error {
         source: table::error::Error,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("Internal error"))]
     Internal {
         location: Location,
         source: BoxedError,
@@ -216,7 +216,7 @@ pub enum Error {
     #[snafu(display("Illegal access to catalog: {} and schema: {}", catalog, schema))]
     QueryAccessDenied { catalog: String, schema: String },
 
-    #[snafu(display(""))]
+    #[snafu(display("DataFusion error"))]
     Datafusion {
         #[snafu(source)]
         error: DataFusionError,

diff --git a/src/common/recordbatch/src/error.rs b/src/common/recordbatch/src/error.rs
@@ -55,7 +55,7 @@ pub enum Error {
         location: Location,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("Failed to poll result stream"))]
     PollStream {
         #[snafu(source)]
         error: datafusion::error::DataFusionError,

diff --git a/src/frontend/src/error.rs b/src/frontend/src/error.rs
@@ -44,7 +44,7 @@ pub enum Error {
         source: common_meta::error::Error,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("External error"))]
     External {
         location: Location,
         source: BoxedError,
@@ -170,7 +170,7 @@ pub enum Error {
         source: query::error::Error,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("Operation to region server failed"))]
     InvokeRegionServer {
         location: Location,
         source: servers::error::Error,

diff --git a/src/query/src/datafusion/error.rs b/src/query/src/datafusion/error.rs
@@ -25,7 +25,7 @@ use snafu::{Location, Snafu};
 #[snafu(visibility(pub))]
 #[stack_trace_debug]
 pub enum InnerError {
-    #[snafu(display(""))]
+    #[snafu(display("DataFusion error"))]
     Datafusion {
         #[snafu(source)]
         error: DataFusionError,

diff --git a/src/query/src/error.rs b/src/query/src/error.rs
@@ -121,7 +121,7 @@ pub enum Error {
         location: Location,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("DataFusion error"))]
     DataFusion {
         #[snafu(source)]
         error: DataFusionError,
@@ -140,7 +140,7 @@ pub enum Error {
         source: sql::error::Error,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("Failed to plan SQL"))]
     PlanSql {
         #[snafu(source)]
         error: DataFusionError,

diff --git a/src/script/src/python/error.rs b/src/script/src/python/error.rs
@@ -76,7 +76,7 @@ pub enum Error {
         error: ArrowError,
     },
 
-    #[snafu(display(""))]
+    #[snafu(display("DataFusion error"))]
     DataFusion {
         location: SnafuLocation,
         #[snafu(source)]

diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs
@@ -339,8 +339,12 @@ pub enum Error {
         source: crate::http::pprof::nix::Error,
     },
 
-    #[snafu(display(""))]
-    Metrics { source: BoxedError },
+    #[snafu(display("Failed to update jemalloc metrics"))]
+    UpdateJemallocMetrics {
+        #[snafu(source)]
+        error: tikv_jemalloc_ctl::Error,
+        location: Location,
+    },
 
     #[snafu(display("DataFrame operation error"))]
     DataFrame {
@@ -408,7 +412,8 @@ impl ErrorExt for Error {
             | TcpIncoming { .. }
             | CatalogError { .. }
             | GrpcReflectionService { .. }
-            | BuildHttpResponse { .. } => StatusCode::Internal,
+            | BuildHttpResponse { .. }
+            | UpdateJemallocMetrics { .. } => StatusCode::Internal,
 
             CollectRecordbatch { .. } => StatusCode::EngineExecuteQuery,
 
@@ -479,8 +484,6 @@ impl ErrorExt for Error {
             #[cfg(feature = "pprof")]
             DumpPprof { source, .. } => source.status_code(),
 
-            Metrics { source } => source.status_code(),
-
             ConvertScalarValue { source, .. } => source.status_code(),
 
             ToJson { .. } => StatusCode::Internal,

diff --git a/src/servers/src/metrics/jemalloc.rs b/src/servers/src/metrics/jemalloc.rs
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod error;
-
 use common_telemetry::error;
-use error::UpdateJemallocMetricsSnafu;
 use lazy_static::lazy_static;
 use once_cell::sync::Lazy;
 use prometheus::*;
 use snafu::ResultExt;
 use tikv_jemalloc_ctl::stats::{allocated_mib, resident_mib};
 use tikv_jemalloc_ctl::{epoch, epoch_mib, stats};
 
+use crate::error::UpdateJemallocMetricsSnafu;
+
 lazy_static! {
     pub static ref SYS_JEMALLOC_RESIDEN: IntGauge = register_int_gauge!(
         "sys_jemalloc_resident",

diff --git a/src/servers/src/metrics/jemalloc/error.rs b/src/servers/src/metrics/jemalloc/error.rs
diff --git a/src/table/src/error.rs b/src/table/src/error.rs
@@ -30,7 +30,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[snafu(visibility(pub))]
 #[stack_trace_debug]
 pub enum Error {
-    #[snafu(display(""))]
+    #[snafu(display("DataFusion error"))]
     Datafusion {
         #[snafu(source)]
         error: DataFusionError,