Merge pull request #5216 from Xuanwo/opendal-v0.6

feat: Introduce opendal 0.6 and enable retry support
databendlabs · May 7, 2022 · ff5d022 · ff5d022
2 parents b96272e + 5dc05b8
commit ff5d022
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/contexts/Cargo.toml b/common/contexts/Cargo.toml
@@ -12,5 +12,5 @@ test = false
 common-base = { path = "../base" }
 
 async-trait = "0.1.53"
-opendal = "0.5.2"
+opendal = { version = "0.6.0", features = ["retry"] }
 time = "0.3.9"
diff --git a/common/io/Cargo.toml b/common/io/Cargo.toml
@@ -25,7 +25,7 @@ chrono = "0.4.19"
 chrono-tz = "0.6.1"
 futures = "0.3.21"
 lexical-core = "0.8.2"
-opendal = "0.5.2"
+opendal = { version = "0.6.0", features = ["retry"] }
 serde = { version = "1.0.136", features = ["derive"] }
 time = "0.3.9"
 

diff --git a/common/streams/Cargo.toml b/common/streams/Cargo.toml
@@ -35,4 +35,4 @@ serde_json = { version = "1.0.79", default-features = false, features = ["preser
 tempfile = "3.3.0"
 
 [dev-dependencies]
-opendal = "0.5.2"
+opendal = { version = "0.6.0", features = ["retry"] }
diff --git a/query/Cargo.toml b/query/Cargo.toml
@@ -64,6 +64,7 @@ async-recursion = "1.0.0"
 async-stream = "0.3.3"
 async-trait = "0.1.53"
 backoff = "0.4.0"
+backon = "0.0.2"
 base64 = "0.13.0"
 bit-vec = { version = "0.6.3", features = ["serde_std"] }
 bumpalo = "3.9.1"
@@ -87,7 +88,7 @@ num = "0.4.0"
 num_cpus = "1.13.1"
 octocrab = "0.15.4"
 once_cell = "1.10.0"
-opendal = "0.5.2"
+opendal = { version = "0.6.0", features = ["retry"] }
 openssl = { version = "0.10", features = ["vendored"] }
 paste = "1.0.7"
 petgraph = "0.6.0"

diff --git a/query/src/sessions/session_mgr.rs b/query/src/sessions/session_mgr.rs
@@ -405,7 +405,8 @@ impl SessionManager {
             }
         };
 
-        Ok(Operator::new(accessor))
+        // Enable exponential backoff by default
+        Ok(Operator::new(accessor).with_backoff(backon::ExponentialBackoff::default()))
     }
 
     pub async fn reload_config(&self) -> Result<()> {