Skip to content

Commit

Permalink
Remove obsolete crutest perf test (#1528)
Browse files Browse the repository at this point in the history
Remove the perf test from crutest. There are other better tests now and
this one is just a distraction.

Removed the tools/test_perf.sh script and places that referenced it.

Fix for: #1527

---------

Co-authored-by: Alan Hanson <alan@oxide.computer>
  • Loading branch information
leftwo and Alan Hanson authored Nov 1, 2024
1 parent 697d01e commit 06ca533
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 738 deletions.
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ for t in crucible-downstairs crucible-hammer crutest dsc crudd; do
done

mkdir -p /work/scripts
for s in tools/test_perf.sh tools/crudd-speed-battery.sh tools/dtrace/perf-downstairs-tick.d tools/dtrace/upstairs_info.d tools/test_mem.sh; do
for s in tools/crudd-speed-battery.sh tools/dtrace/perf-downstairs-tick.d tools/dtrace/upstairs_info.d tools/test_mem.sh; do
cp "$s" /work/scripts/
done

Expand Down
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crutest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ crucible-client-types.workspace = true
crucible-common.workspace = true
crucible-protocol.workspace = true
crucible.workspace = true
csv.workspace = true
dsc-client.workspace = true
human_bytes.workspace = true
futures-core.workspace = true
Expand Down
63 changes: 0 additions & 63 deletions crutest/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,24 +145,6 @@ enum CliCommand {
Info,
/// Report if the Upstairs is ready for IO
IsActive,
/// Run the client perf test
Perf {
/// Number of IOs to execute for each test phase
#[clap(long, short, default_value = "5000", action)]
count: usize,
/// Size in blocks of each IO
#[clap(long, default_value = "1", action)]
io_size: usize,
/// Number of outstanding IOs at the same time
#[clap(long, default_value = "1", action)]
io_depth: usize,
/// Number of read test loops to do.
#[clap(long, default_value = "2", action)]
read_loops: usize,
/// Number of write test loops to do.
#[clap(long, default_value = "2", action)]
write_loops: usize,
},
/// Quit the CLI
Quit,
/// Read from a given block offset
Expand Down Expand Up @@ -522,22 +504,6 @@ async fn cmd_to_msg(
CliCommand::Info => {
fw.send(CliMessage::InfoPlease).await?;
}
CliCommand::Perf {
count,
io_size,
io_depth,
read_loops,
write_loops,
} => {
fw.send(CliMessage::Perf(
count,
io_size,
io_depth,
read_loops,
write_loops,
))
.await?;
}
CliCommand::Quit => {
println!("The quit command has nothing to send");
return Ok(());
Expand Down Expand Up @@ -936,35 +902,6 @@ async fn process_cli_command(
Err(e) => fw.send(CliMessage::Error(e)).await,
}
}
CliMessage::Perf(count, io_size, io_depth, read_loops, write_loops) => {
if let Some(ri) = ri_option {
perf_header();
match perf_workload(
volume,
ri,
None,
count,
io_size,
io_depth,
read_loops,
write_loops,
)
.await
{
Ok(_) => fw.send(CliMessage::DoneOk).await,
Err(e) => {
let msg = format!("{}", e);
let e = CrucibleError::GenericError(msg);
fw.send(CliMessage::Error(e)).await
}
}
} else {
fw.send(CliMessage::Error(CrucibleError::GenericError(
"Info not initialized".to_string(),
)))
.await
}
}
CliMessage::RandRead => {
if let Some(ri) = ri_option {
let mut rng = rand_chacha::ChaCha8Rng::from_entropy();
Expand Down
Loading

0 comments on commit 06ca533

Please sign in to comment.