Merge pull request #10114 from drmingdrmer/50-exception

refactor: remove dependency of common-exceptionn from common-meta-types

src/common/exception/Cargo.toml

@@ -12,6 +12,8 @@ test = false
 
 [dependencies] # In alphabetical order
 common-arrow = { path = "../arrow" }
+common-meta-stoerr = { path = "../../meta/stoerr" }
+common-meta-types = { path = "../../meta/types" }
 
 # Github dependencies
 # TODO: Use the version from crates.io once

src/common/exception/src/exception_code.rs

@@ -158,7 +158,7 @@ build_exceptions! {
     TableSchemaMismatch(1303),
 }
 
-// Metasvr errors [2001, 3000].
+// Meta service errors [2001, 3000].
 build_exceptions! {
     // Meta service does not work.
     MetaServiceError(2001),

src/common/exception/src/exception_into.rs

@@ -19,6 +19,10 @@ use std::fmt::Display;
 use std::fmt::Formatter;
 use std::sync::Arc;
 
+use common_meta_stoerr::MetaStorageError;
+use common_meta_types::MetaAPIError;
+use common_meta_types::MetaError;
+
 use crate::exception::ErrorCodeBacktrace;
 use crate::ErrorCode;
 
@@ -275,6 +279,24 @@ impl From<tonic::Status> for ErrorCode {
     }
 }
 
+impl From<MetaError> for ErrorCode {
+    fn from(e: MetaError) -> Self {
+        ErrorCode::MetaServiceError(e.to_string())
+    }
+}
+
+impl From<MetaAPIError> for ErrorCode {
+    fn from(e: MetaAPIError) -> Self {
+        ErrorCode::MetaServiceError(e.to_string())
+    }
+}
+
+impl From<MetaStorageError> for ErrorCode {
+    fn from(e: MetaStorageError) -> Self {
+        ErrorCode::MetaServiceError(e.to_string())
+    }
+}
+
 impl From<ErrorCode> for tonic::Status {
     fn from(err: ErrorCode) -> Self {
         let rst_json = serde_json::to_vec::<SerializedError>(&SerializedError {

src/meta/api/src/kv_app_error.rs

@@ -53,7 +53,7 @@ impl From<KVAppError> for ErrorCode {
     fn from(e: KVAppError) -> Self {
         match e {
             KVAppError::AppError(app_err) => app_err.into(),
-            KVAppError::MetaError(meta_err) => meta_err.into(),
+            KVAppError::MetaError(meta_err) => ErrorCode::MetaServiceError(meta_err.to_string()),
         }
     }
 }

src/meta/client/tests/it/grpc_client.rs

@@ -22,6 +22,8 @@ use common_meta_app::schema::GetDatabaseReq;
 use common_meta_client::MetaGrpcClient;
 use common_meta_client::MIN_METASRV_SEMVER;
 use common_meta_types::protobuf::meta_service_client::MetaServiceClient;
+use common_meta_types::MetaClientError;
+use common_meta_types::MetaError;
 
 use crate::grpc_server::start_grpc_server;
 
@@ -69,7 +71,8 @@ async fn test_grpc_client_handshake_timeout() {
         .await;
 
         let got = res.unwrap_err();
-        let got = ErrorCode::from(got).message();
+        let got =
+            ErrorCode::from(MetaError::ClientError(MetaClientError::HandshakeError(got))).message();
         let expect = "failed to handshake with meta-service: when sending handshake rpc, cause: tonic::status::Status: status: Cancelled, message: \"Timeout expired\", details: [], metadata: MetadataMap { headers: {} } source: transport error source: Timeout expired";
         assert_eq!(got, expect);
     }

src/meta/raft-store/src/state_machine/sm.rs

@@ -20,7 +20,6 @@ use std::time::Instant;
 use std::time::SystemTime;
 use std::time::UNIX_EPOCH;
 
-use common_exception::WithContext;
 use common_meta_sled_store::get_sled_db;
 use common_meta_sled_store::openraft;
 use common_meta_sled_store::openraft::EffectiveMembership;
@@ -147,8 +146,7 @@ impl StateMachine {
         let db = get_sled_db();
 
         // it blocks and slow
-        db.drop_tree(tree_name)
-            .context(|| "drop prev state machine")?;
+        db.drop_tree(tree_name)?;
 
         Ok(())
     }
@@ -208,7 +206,7 @@ impl StateMachine {
 
         let mut kvs = Vec::new();
         for rkv in view {
-            let (k, v) = rkv.context(|| "taking snapshot")?;
+            let (k, v) = rkv?;
             kvs.push(vec![k.to_vec(), v.to_vec()]);
         }
         let snap = SerializableSnapshot { kvs };

src/meta/service/Cargo.toml

@@ -26,7 +26,6 @@ io-uring = [
 # Workspace dependencies
 common-arrow = { path = "../../common/arrow" }
 common-base = { path = "../../common/base" }
-common-exception = { path = "../../common/exception" }
 common-grpc = { path = "../../common/grpc" }
 common-http = { path = "../../common/http" }
 common-meta-api = { path = "../api" }

src/meta/service/src/store/store_bare.rs

@@ -20,7 +20,6 @@ use std::ops::RangeBounds;
 use anyerror::AnyError;
 use common_base::base::tokio::sync::RwLock;
 use common_base::base::tokio::sync::RwLockWriteGuard;
-use common_exception::WithContext;
 use common_meta_raft_store::applied_state::AppliedState;
 use common_meta_raft_store::config::RaftConfig;
 use common_meta_raft_store::log::RaftLog;
@@ -262,7 +261,7 @@ impl RaftStoreBare {
         for x in snap.kvs.into_iter() {
             let k = &x[0];
             let v = &x[1];
-            tree.insert(k, v.clone()).context(|| "insert snapshot")?;
+            tree.insert(k, v.clone())?;
         }
 
         info!(
@@ -271,7 +270,7 @@ impl RaftStoreBare {
             new_sm.get_last_applied()?,
         );
 
-        tree.flush_async().await.context(|| "flush snapshot")?;
+        tree.flush_async().await?;
 
         info!("flushed tree, no_kvs: {}", nkvs);
 

src/meta/sled-store/Cargo.toml

@@ -15,7 +15,6 @@ test = false
 io-uring = ["sled/io_uring"]
 
 [dependencies]
-common-exception = { path = "../../common/exception" }
 common-meta-stoerr = { path = "../stoerr" }
 common-meta-types = { path = "../types" }
 

src/meta/sled-store/src/sled_tree.rs

@@ -17,7 +17,6 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::ops::RangeBounds;
 
-use common_exception::WithContext;
 use common_meta_stoerr::MetaStorageError;
 use common_meta_types::anyerror::AnyError;
 use common_meta_types::Change;
@@ -117,9 +116,7 @@ impl SledTree {
             let x = &x[0..5];
             assert_eq!(x, b"test-");
         }
-        let t = db
-            .open_tree(&tree_name)
-            .context(|| format!("open tree: {}", tree_name))?;
+        let t = db.open_tree(&tree_name)?;
 
         debug!("SledTree opened tree: {}", tree_name);
 
@@ -208,10 +205,7 @@ impl SledTree {
         &self,
         key: &KV::K,
     ) -> Result<Option<KV::V>, MetaStorageError> {
-        let got = self
-            .tree
-            .get(KV::serialize_key(key)?)
-            .context(|| format!("get: {}:{}", self.name, key))?;
+        let got = self.tree.get(KV::serialize_key(key)?)?;
 
         let v = match got {
             None => None,
@@ -237,16 +231,12 @@ impl SledTree {
         // Convert K range into sled::IVec range
         let sled_range = KV::serialize_range(&range)?;
 
-        let range_mes = self.range_message::<KV, _>(&range);
-
         for item in self.tree.range(sled_range) {
-            let (k, _) = item.context(|| format!("range_remove: {}", range_mes,))?;
+            let (k, _) = item?;
             batch.remove(k);
         }
 
-        self.tree
-            .apply_batch(batch)
-            .context(|| format!("batch remove: {}", range_mes,))?;
+        self.tree.apply_batch(batch)?;
 
         self.flush_async(flush).await?;
 
@@ -265,14 +255,12 @@ impl SledTree {
         KV: SledKeySpace,
         R: RangeBounds<KV::K>,
     {
-        let range_mes = self.range_message::<KV, _>(&range);
-
         // Convert K range into sled::IVec range
         let range = KV::serialize_range(&range)?;
 
         let it = self.tree.range(range);
         let it = it.map(move |item| {
-            let (k, v) = item.context(|| format!("range_get: {}", range_mes,))?;
+            let (k, v) = item?;
 
             let item = SledItem::new(k, v);
             Ok(item)
@@ -291,11 +279,9 @@ impl SledTree {
     {
         let mut res = vec![];
 
-        let mes = || format!("scan_prefix: {}", prefix);
-
         let pref = KV::serialize_key(prefix)?;
         for item in self.tree.scan_prefix(pref) {
-            let (k, v) = item.context(mes)?;
+            let (k, v) = item?;
 
             let key = KV::deserialize_key(k)?;
             let value = KV::deserialize_value(v)?;
@@ -323,7 +309,7 @@ impl SledTree {
             batch.insert(k, v);
         }
 
-        self.tree.apply_batch(batch).context(|| "batch append")?;
+        self.tree.apply_batch(batch)?;
 
         self.flush_async(true).await?;
 
@@ -343,10 +329,7 @@ impl SledTree {
         let k = KV::serialize_key(key)?;
         let v = KV::serialize_value(value)?;
 
-        let prev = self
-            .tree
-            .insert(k, v)
-            .context(|| format!("insert_value {}", key))?;
+        let prev = self.tree.insert(k, v)?;
 
         let prev = match prev {
             None => None,
@@ -359,6 +342,7 @@ impl SledTree {
     }
 
     /// Build a string describing the range for a range operation.
+    #[allow(dead_code)]
     fn range_message<KV, R>(&self, range: &R) -> String
     where
         KV: SledKeySpace,
@@ -376,10 +360,7 @@ impl SledTree {
     #[tracing::instrument(level = "debug", skip(self))]
     async fn flush_async(&self, flush: bool) -> Result<(), MetaStorageError> {
         if flush && self.sync {
-            self.tree
-                .flush_async()
-                .await
-                .context(|| "flush sled-tree")?;
+            self.tree.flush_async().await?;
         }
         Ok(())
     }

src/meta/stoerr/Cargo.toml

@@ -11,7 +11,6 @@ doctest = false
 test = false
 
 [dependencies]
-common-exception = { path = "../../common/exception" }
 
 anyerror = { workspace = true }
 prost = { workspace = true }

src/meta/stoerr/src/meta_storage_errors.rs

@@ -12,12 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::any;
-use std::backtrace::Backtrace;
-
 use anyerror::AnyError;
-use common_exception::ErrorCode;
-use common_exception::ErrorWithContext;
 use serde::Deserialize;
 use serde::Serialize;
 use sled::transaction::UnabortableTransactionError;
@@ -43,12 +38,6 @@ pub enum MetaStorageError {
     TransactionConflict,
 }
 
-impl From<MetaStorageError> for ErrorCode {
-    fn from(e: MetaStorageError) -> Self {
-        ErrorCode::MetaStorageError(e.to_string()).set_backtrace(any::request_ref::<Backtrace>(&e))
-    }
-}
-
 impl From<std::string::FromUtf8Error> for MetaStorageError {
     fn from(error: std::string::FromUtf8Error) -> Self {
         MetaStorageError::BytesError(MetaBytesError::new(&error))
@@ -67,12 +56,6 @@ impl From<sled::Error> for MetaStorageError {
     }
 }
 
-impl From<ErrorWithContext<sled::Error>> for MetaStorageError {
-    fn from(e: ErrorWithContext<sled::Error>) -> MetaStorageError {
-        MetaStorageError::SledError(AnyError::new(&e.err).add_context(|| e.context))
-    }
-}
-
 impl From<UnabortableTransactionError> for MetaStorageError {
     fn from(error: UnabortableTransactionError) -> Self {
         match error {

src/meta/types/Cargo.toml

@@ -11,7 +11,6 @@ doctest = false
 test = false
 
 [dependencies]
-common-exception = { path = "../../common/exception" }
 common-meta-stoerr = { path = "../stoerr" }
 
 openraft = { workspace = true }

src/meta/types/src/cluster.rs

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 use std::fmt;
+use std::net::AddrParseError;
 use std::net::SocketAddr;
 use std::str::FromStr;
 
-use common_exception::exception::Result;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -97,7 +97,7 @@ impl NodeInfo {
         }
     }
 
-    pub fn ip_port(&self) -> Result<(String, u16)> {
+    pub fn ip_port(&self) -> Result<(String, u16), AddrParseError> {
         let addr = SocketAddr::from_str(&self.flight_address)?;
 
         Ok((addr.ip().to_string(), addr.port()))