Skip to content

Commit 06ca533

Browse files
leftwoAlan Hanson
and
Alan Hanson
authored
Remove obsolete crutest perf test (#1528)
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>
1 parent 697d01e commit 06ca533

File tree

9 files changed

+1
-738
lines changed

9 files changed

+1
-738
lines changed

.github/buildomat/jobs/build-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ for t in crucible-downstairs crucible-hammer crutest dsc crudd; do
8181
done
8282

8383
mkdir -p /work/scripts
84-
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
84+
for s in tools/crudd-speed-battery.sh tools/dtrace/perf-downstairs-tick.d tools/dtrace/upstairs_info.d tools/test_mem.sh; do
8585
cp "$s" /work/scripts/
8686
done
8787

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crutest/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ crucible-client-types.workspace = true
1515
crucible-common.workspace = true
1616
crucible-protocol.workspace = true
1717
crucible.workspace = true
18-
csv.workspace = true
1918
dsc-client.workspace = true
2019
human_bytes.workspace = true
2120
futures-core.workspace = true

crutest/src/cli.rs

-63
Original file line numberDiff line numberDiff line change
@@ -145,24 +145,6 @@ enum CliCommand {
145145
Info,
146146
/// Report if the Upstairs is ready for IO
147147
IsActive,
148-
/// Run the client perf test
149-
Perf {
150-
/// Number of IOs to execute for each test phase
151-
#[clap(long, short, default_value = "5000", action)]
152-
count: usize,
153-
/// Size in blocks of each IO
154-
#[clap(long, default_value = "1", action)]
155-
io_size: usize,
156-
/// Number of outstanding IOs at the same time
157-
#[clap(long, default_value = "1", action)]
158-
io_depth: usize,
159-
/// Number of read test loops to do.
160-
#[clap(long, default_value = "2", action)]
161-
read_loops: usize,
162-
/// Number of write test loops to do.
163-
#[clap(long, default_value = "2", action)]
164-
write_loops: usize,
165-
},
166148
/// Quit the CLI
167149
Quit,
168150
/// Read from a given block offset
@@ -522,22 +504,6 @@ async fn cmd_to_msg(
522504
CliCommand::Info => {
523505
fw.send(CliMessage::InfoPlease).await?;
524506
}
525-
CliCommand::Perf {
526-
count,
527-
io_size,
528-
io_depth,
529-
read_loops,
530-
write_loops,
531-
} => {
532-
fw.send(CliMessage::Perf(
533-
count,
534-
io_size,
535-
io_depth,
536-
read_loops,
537-
write_loops,
538-
))
539-
.await?;
540-
}
541507
CliCommand::Quit => {
542508
println!("The quit command has nothing to send");
543509
return Ok(());
@@ -936,35 +902,6 @@ async fn process_cli_command(
936902
Err(e) => fw.send(CliMessage::Error(e)).await,
937903
}
938904
}
939-
CliMessage::Perf(count, io_size, io_depth, read_loops, write_loops) => {
940-
if let Some(ri) = ri_option {
941-
perf_header();
942-
match perf_workload(
943-
volume,
944-
ri,
945-
None,
946-
count,
947-
io_size,
948-
io_depth,
949-
read_loops,
950-
write_loops,
951-
)
952-
.await
953-
{
954-
Ok(_) => fw.send(CliMessage::DoneOk).await,
955-
Err(e) => {
956-
let msg = format!("{}", e);
957-
let e = CrucibleError::GenericError(msg);
958-
fw.send(CliMessage::Error(e)).await
959-
}
960-
}
961-
} else {
962-
fw.send(CliMessage::Error(CrucibleError::GenericError(
963-
"Info not initialized".to_string(),
964-
)))
965-
.await
966-
}
967-
}
968905
CliMessage::RandRead => {
969906
if let Some(ri) = ri_option {
970907
let mut rng = rand_chacha::ChaCha8Rng::from_entropy();

0 commit comments

Comments
 (0)