src/api2/admin/datastore/backup.rs: add speedtest api, improve upload speed

We need to disable tcp Nagle algorythm (set_nodelay), and use larger window size for http2
This commit is contained in:
Dietmar Maurer
2019-05-16 10:24:23 +02:00
parent 372724afea
commit adec8ea263
5 changed files with 139 additions and 4 deletions

View File

@ -103,6 +103,9 @@ fn upgrade_to_backup_protocol(
let mut http = hyper::server::conn::Http::new();
http.http2_only(true);
// increase window size: todo - find optiomal size
http.http2_initial_stream_window_size( (1 << 31) - 2);
http.http2_initial_connection_window_size( (1 << 31) - 2);
http.serve_connection(conn, service)
.map_err(Error::from)
@ -174,6 +177,10 @@ fn backup_api() -> Router {
)
)
)
.subdir(
"speedtest", Router::new()
.upload(api_method_upload_speedtest())
)
.subdir("test1", test1)
.subdir("test2", test2)
.list_subdirs();

View File

@ -99,3 +99,41 @@ fn upload_dynamic_chunk(
Ok(Box::new(resp))
}
pub fn api_method_upload_speedtest() -> ApiAsyncMethod {
ApiAsyncMethod::new(
upload_speedtest,
ObjectSchema::new("Test uploadf speed.")
)
}
fn upload_speedtest(
_parts: Parts,
req_body: Body,
param: Value,
_info: &ApiAsyncMethod,
rpcenv: Box<RpcEnvironment>,
) -> Result<BoxFut, Error> {
let resp = req_body
.map_err(Error::from)
.fold(0, |size: usize, chunk| -> Result<usize, Error> {
let sum = size + chunk.len();
//println!("UPLOAD {} bytes, sum {}", chunk.len(), sum);
Ok(sum)
})
.then(move |result| {
match result {
Ok(size) => {
println!("UPLOAD END {} bytes", size);
}
Err(err) => {
println!("Upload error: {}", err);
}
}
let env: &BackupEnvironment = rpcenv.as_ref();
Ok(env.format_response(Ok(Value::Null)))
});
Ok(Box::new(resp))
}