try using rustls feature in addition to rustls-tls, connection pool 20, and add throughput logging

Signed-off-by: technillogue <[email protected]>

Author: technillogue

storage/Cargo.toml

@@ -23,7 +23,7 @@ leaky-bucket = { version = "0.12.1", optional = true }
 libc = "0.2"
 log = "0.4.8"
 nix = "0.24"
-reqwest = { version = "0.11.14", features = ["blocking", "json"], optional = true }
+reqwest = { version = "0.11.14", features = ["blocking", "json", "rustls", "rustls-tls"], optional = true }
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
 serde_json = "1.0.53"
 sha1 = { version = "0.10.5", optional = true }

storage/src/backend/connection.rs

@@ -631,6 +631,9 @@ impl Connection {
             .timeout(timeout)
             .connect_timeout(connect_timeout)
             .redirect(Policy::none());
+            .use_rustls_tls()
+            .tcp_keepalive(Some(Duration::from_secs(5 * 60)))
+            .pool_max_idle_per_host(20);
 
         if config.skip_verify {
             cb = cb.danger_accept_invalid_certs(true);
@@ -639,7 +642,11 @@ impl Connection {
         if !proxy.is_empty() {
             cb = cb.proxy(reqwest::Proxy::all(proxy).map_err(|e| einval!(e))?)
         }
-
+        debug!(
+            "{} building connection with proxy: {}",
+            std::thread::current().name().unwrap_or_default(),
+            proxy
+        );
         cb.build().map_err(|e| einval!(e))
     }
 

storage/src/cache/mod.rs

@@ -270,13 +270,17 @@ pub trait BlobCache: Send + Sync {
             )));
         }
         let duration = Instant::now().duration_since(start).as_millis();
+        let duration_s = duration as f64 / 1000.0;
+        let throughput_mbps = blob_size as f64 / duration_s / 1_000_000.0;
+
         debug!(
-            "read_chunks_from_backend: {} {} {} bytes at {}, duration {}ms",
+            "read_chunks_from_backend: {} {} {} bytes at {}, duration {}ms, throughput {:.4}Mbps",
             std::thread::current().name().unwrap_or_default(),
             if prefetch { "prefetch" } else { "fetch" },
             blob_size,
             blob_offset,
-            duration
+            duration,
+            throughput_mbps
         );
 
         let chunks = chunks.iter().map(|v| v.as_ref()).collect();
@@ -328,12 +332,15 @@ pub trait BlobCache: Send + Sync {
         }
 
         let duration = Instant::now().duration_since(start).as_millis();
+        let duration_s = duration as f64 / 1000.0;
+        let throughput_mbps = blob_size as f64 / duration_s / 1_000_000.0;
         debug!(
-            "read_chunk_from_backend: {} {} bytes at {}, duration {}ms",
+            "read_chunk_from_backend: {} {} bytes at {}, duration {}ms, throughput {:.4}Mbps",
             std::thread::current().name().unwrap_or_default(),
             chunk.compressed_size(),
             chunk.compressed_offset(),
-            duration
+            duration,
+            throughput_mbps
         );
         self.validate_chunk_data(chunk, buffer, false)
             .map_err(|e| {