From 8464b471769a1c318d14216cff72211d1d061baf Mon Sep 17 00:00:00 2001 From: Daniel Carl Jones Date: Mon, 16 Sep 2024 20:17:57 +0100 Subject: [PATCH 1/2] Update mock-mount-s3 to require '--max-throughput-gbps' argument Signed-off-by: Daniel Carl Jones --- mountpoint-s3/src/bin/mock-mount-s3.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mountpoint-s3/src/bin/mock-mount-s3.rs b/mountpoint-s3/src/bin/mock-mount-s3.rs index 2ed54debf..cb34cb469 100644 --- a/mountpoint-s3/src/bin/mock-mount-s3.rs +++ b/mountpoint-s3/src/bin/mock-mount-s3.rs @@ -10,7 +10,9 @@ //! //! This binary is intended only for use in testing and development of Mountpoint. +use anyhow::anyhow; use futures::executor::ThreadPool; + use mountpoint_s3::cli::CliArgs; use mountpoint_s3::s3::S3Personality; use mountpoint_s3_client::mock_client::throughput_client::ThroughputMockClient; @@ -32,7 +34,11 @@ fn create_mock_client(args: &CliArgs) -> anyhow::Result<(ThroughputMockClient, T tracing::warn!("using mock client"); - let max_throughput_gbps = args.maximum_throughput_gbps.unwrap_or(10) as f64; + let Some(max_throughput_gbps) = args.maximum_throughput_gbps else { + return Err(anyhow!( + "must set --max-throughput-gbps when using mock-mount-s3 binary" + )); + }; tracing::info!("mock client target network throughput {max_throughput_gbps} Gbps"); let config = MockClientConfig { @@ -41,7 +47,7 @@ fn create_mock_client(args: &CliArgs) -> anyhow::Result<(ThroughputMockClient, T unordered_list_seed: None, ..Default::default() }; - let client = ThroughputMockClient::new(config, max_throughput_gbps); + let client = ThroughputMockClient::new(config, max_throughput_gbps as f64); let runtime = ThreadPool::builder().name_prefix("runtime").create()?; From e4574cbd48871c59cb3f7db581a227e56dc9cf1b Mon Sep 17 00:00:00 2001 From: Daniel Carl Jones Date: Tue, 24 Sep 2024 09:13:58 +0100 Subject: [PATCH 2/2] Fix error message Signed-off-by: Daniel Carl Jones --- mountpoint-s3/src/bin/mock-mount-s3.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mountpoint-s3/src/bin/mock-mount-s3.rs b/mountpoint-s3/src/bin/mock-mount-s3.rs index cb34cb469..fb65f47a7 100644 --- a/mountpoint-s3/src/bin/mock-mount-s3.rs +++ b/mountpoint-s3/src/bin/mock-mount-s3.rs @@ -36,7 +36,7 @@ fn create_mock_client(args: &CliArgs) -> anyhow::Result<(ThroughputMockClient, T let Some(max_throughput_gbps) = args.maximum_throughput_gbps else { return Err(anyhow!( - "must set --max-throughput-gbps when using mock-mount-s3 binary" + "must set --maximum-throughput-gbps when using mock-mount-s3 binary" )); }; tracing::info!("mock client target network throughput {max_throughput_gbps} Gbps");