Skip to content

Commit 3afeb1b

Browse files
craig[bot]tbg
andcommitted
Merge #147761
147761: roachtest: end sysbench's bench.txt with newline r=tbg a=tbg Otherwise, they can't be concatenated as easily for use with benchstat. Epic: CRDB-42584 Release note: none Co-authored-by: Tobias Grieger <[email protected]>
2 parents 07a43d7 + 2802ab5 commit 3afeb1b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pkg/cmd/roachtest/tests/sysbench.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,6 @@ func sysbenchToGoBench(name string, result string) (string, error) {
820820
}
821821

822822
// Return formatted benchmark string with all metrics.
823-
return fmt.Sprintf("%s\t1\t%s queries/sec\t%s txns/sec\t%s ms/min\t%s ms/avg\t%s ms/p95\t%s ms/max",
823+
return fmt.Sprintf("%s\t1\t%s queries/sec\t%s txns/sec\t%s ms/min\t%s ms/avg\t%s ms/p95\t%s ms/max\n",
824824
benchName, qps, tps, minLat, avgLat, p95Lat, maxLat), nil
825825
}

pkg/cmd/roachtest/tests/sysbench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Threads fairness:
4747
events (avg/stddev): 11954.3281/1290.50
4848
execution time (avg/stddev): 599.9974/0.01`,
4949
benchmarkName: "sysbench-settings/oltp_read_write/nodes=3/cpu=8/conc=64",
50-
expectedOutput: "BenchmarkSysbenchSettings/a=oltp_read_write/nodes=3/cpu=8/conc=64\t1\t25501.03 queries/sec\t1275.05 txns/sec\t11.86 ms/min\t50.19 ms/avg\t81.48 ms/p95\t276.58 ms/max",
50+
expectedOutput: "BenchmarkSysbenchSettings/a=oltp_read_write/nodes=3/cpu=8/conc=64\t1\t25501.03 queries/sec\t1275.05 txns/sec\t11.86 ms/min\t50.19 ms/avg\t81.48 ms/p95\t276.58 ms/max\n",
5151
expectError: false,
5252
},
5353
{

0 commit comments

Comments
 (0)