Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 5 Wiki Activity

Perf measurement & bottleneck fix #102

Merged
quentin merged 16 commits from perf/cpu-ram-bottleneck into main 2024-02-23 17:32:39 +00:00
Conversation 0 Commits 16 Files changed 30 +20 -19
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0b122582e8 - Show all commits

33
src/storage/garage.rs
View file

@ -2,8 +2,8 @@ use aws_sdk_s3::{self as s3, error::SdkError, operation::get_object::GetObjectEr
use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder; use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
use aws_smithy_runtime_api::client::http::SharedHttpClient; use aws_smithy_runtime_api::client::http::SharedHttpClient;
use hyper_rustls::HttpsConnector; use hyper_rustls::HttpsConnector;
use hyper_util::rt::TokioExecutor;
use hyper_util::client::legacy::{connect::HttpConnector, Client as HttpClient}; use hyper_util::client::legacy::{connect::HttpConnector, Client as HttpClient};
use hyper_util::rt::TokioExecutor;
use serde::Serialize; use serde::Serialize;
use crate::storage::*; use crate::storage::*;
@ -15,13 +15,13 @@ pub struct GarageRoot {
impl GarageRoot { impl GarageRoot {
pub fn new() -> anyhow::Result<Self> { pub fn new() -> anyhow::Result<Self> {
let connector = hyper_rustls::HttpsConnectorBuilder::new() let connector = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots()? .with_native_roots()?
.https_or_http() .https_or_http()
.enable_http1() .enable_http1()
.enable_http2() .enable_http2()
.build(); .build();
let k2v_http = HttpClient::builder(TokioExecutor::new()).build(connector); let k2v_http = HttpClient::builder(TokioExecutor::new()).build(connector);
let aws_http = HyperClientBuilder::new().build_https(); let aws_http = HyperClientBuilder::new().build_https();
Ok(Self { k2v_http, aws_http }) Ok(Self { k2v_http, aws_http })
} }
@ -35,7 +35,7 @@ impl GarageRoot {
conf, conf,
aws_http: self.aws_http.clone(), aws_http: self.aws_http.clone(),
k2v_http: self.k2v_http.clone(), k2v_http: self.k2v_http.clone(),
unicity unicity,
})) }))
} }
} }
@ -95,13 +95,14 @@ impl IBuilder for GarageUser {
user_agent: None, user_agent: None,
}; };
let k2v_client = match k2v_client::K2vClient::new_with_client(k2v_config, self.k2v_http.clone()) { let k2v_client =
Err(e) => { match k2v_client::K2vClient::new_with_client(k2v_config, self.k2v_http.clone()) {
tracing::error!("unable to build k2v client: {}", e); Err(e) => {
return Err(StorageError::Internal); tracing::error!("unable to build k2v client: {}", e);
} return Err(StorageError::Internal);
Ok(v) => v, }
}; Ok(v) => v,
};
Ok(Box::new(GarageStore { Ok(Box::new(GarageStore {
bucket: self.conf.bucket.clone(), bucket: self.conf.bucket.clone(),