Convert RedisError into nativelink Error

Adds the ability to convert a RedisError into a Nativelink Error. This will dramatically simplifies error handling when dealing with errors returned by the new redis backend for the scheduler.
TraceMachina · Jun 4, 2024 · 2beda61 · 2beda61
1 parent 8b94236
commit 2beda61
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nativelink-error/BUILD.bazel b/nativelink-error/BUILD.bazel
@@ -11,6 +11,7 @@ rust_library(
         "@crates//:hex",
         "@crates//:prost",
         "@crates//:prost-types",
+        "@crates//:redis",
         "@crates//:tokio",
         "@crates//:tonic",
     ],

diff --git a/nativelink-error/Cargo.toml b/nativelink-error/Cargo.toml
@@ -13,5 +13,6 @@ nativelink-proto = { path = "../nativelink-proto" }
 hex = "0.4.3"
 prost = "0.12.4"
 prost-types = "0.12.4"
+redis = "0.25.2"
 tokio = { version = "1.37.0" }
 tonic = { version = "0.11.0", features = ["gzip"] }
diff --git a/nativelink-error/src/lib.rs b/nativelink-error/src/lib.rs
@@ -191,6 +191,12 @@ impl From<std::io::Error> for Error {
     }
 }
 
+impl From<redis::RedisError> for Error {
+    fn from(err: redis::RedisError) -> Self {
+        make_err!(Code::Internal, "{}", err.to_string())
+    }
+}
+
 impl From<Code> for Error {
     fn from(code: Code) -> Self {
         make_err!(code, "")