Skip to content

Commit 54fcd46

Browse files
ndokosndokos
committed
pbench-trafficgen: Fix unit tests.
Fix perl backwards-incompatibility in BenchPostprocess.pm. It worked fine on RHEL7 but failed on F27. Now it works in both. That allows the pbench-fio unit tests to pass. Fix pbench-moongen unit test: pbench-moongen now uses a default $config setting, which used to be empty. Unrelated and opportunistically added: A pbench-fio unit test was failing because the exit status was not accounted for. pbench-trafficgen: Fix tool postprocessing unit tests. BenchPostproces.pm now produces shorter uids and avoids a stutter.
1 parent e0a1ebd commit 54fcd46

File tree

23 files changed

+163
-143
lines changed

23 files changed

+163
-143
lines changed

‎agent/bench-scripts/gold/pbench-fio/test-20.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
+++ Running test-20 pbench-fio
2+
pbench-fio
3+
python-pandas
4+
--- Finished test-20 pbench-fio (status=1)
5+
+++ pbench tree state
6+
/var/tmp/pbench-test-bench/pbench
7+
/var/tmp/pbench-test-bench/pbench/fio_test-06_1900.01.01T00.00.00
8+
/var/tmp/pbench-test-bench/pbench/pbench.log
9+
/var/tmp/pbench-test-bench/pbench/samples
10+
/var/tmp/pbench-test-bench/pbench/tmp
11+
/var/tmp/pbench-test-bench/pbench/tools-default
12+
/var/tmp/pbench-test-bench/pbench/tools-default/mpstat
13+
/var/tmp/pbench-test-bench/pbench/tools-default/sar
14+
--- pbench tree state
15+
+++ pbench.log file contents
16+
/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] [pbench-fio]pbench-fio 3.3 is installed
17+
/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] [pbench-fio]python-pandas is installed
18+
/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] fio_device_check() /dev/foo,/dev/bar
19+
/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] At least one client did not have block device /dev/foo, exiting
20+
--- pbench.log file contents
21+
+++ test-execution.log file contents
22+
/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench/fio_test-06_1900.01.01T00.00.00 --sysinfo=default beg
23+
/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
24+
/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench/fio_test-06_1900.01.01T00.00.00 beg
25+
--- test-execution.log file contents

‎agent/bench-scripts/gold/pbench-moongen/test-03.txt‎

Lines changed: 109 additions & 109 deletions
Large diffs are not rendered by default.

‎agent/bench-scripts/postprocess/BenchPostprocess.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ sub calc_aggregate_metrics {
450450
foreach my $label ( grep { $_ ne get_label('description_label') and
451451
$_ ne get_label('value_label') and
452452
$_ ne get_label('uid_label') and
453-
$_ ne get_label('role_label') } (keys $$workload_ref{$metric_class}{$metric_type}[0] ) ) {
453+
$_ ne get_label('role_label') } (keys %{ $$workload_ref{$metric_class}{$metric_type}[0] } ) ) {
454454
$agg_dataset{$label} = "all";
455455
}
456456
# Ensure we have at least 1 good series

‎agent/bench-scripts/unittests‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ declare -A expected_status=(
192192
[test-15]=1
193193
[test-17]=1
194194
[test-19]=1
195+
[test-20]=1
195196
[test-21]=1
196197
)
197198

‎agent/tool-scripts/postprocess/gold/fio-0/result/reference-result/csv/fio_clat.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
timestamp_ms,client_hostname:all-server_hostname:all-server_port:all-server_port:all,client_hostname:localhost-1
1+
timestamp_ms,client_hostname:all,client_hostname:localhost-1
22
1000,2888,2888
33
2000,2885,2885
44
3000,2887,2887

‎agent/tool-scripts/postprocess/gold/fio-0/result/reference-result/csv/fio_lat.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
timestamp_ms,client_hostname:all-server_hostname:all-server_port:all-server_port:all,client_hostname:localhost-1
1+
timestamp_ms,client_hostname:all,client_hostname:localhost-1
22
1000,2909,2909
33
2000,2906,2906
44
3000,2908,2908

‎agent/tool-scripts/postprocess/gold/fio-0/result/reference-result/csv/fio_slat.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
timestamp_ms,client_hostname:all-server_hostname:all-server_port:all-server_port:all,client_hostname:localhost-1
1+
timestamp_ms,client_hostname:all,client_hostname:localhost-1
22
1000,21,21
33
2000,21,21
44
3000,20,20

‎agent/tool-scripts/postprocess/gold/fio-0/result/reference-result/fio-average.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
clat-client_hostname:all-server_hostname:all-server_port:all-server_port:all=2930.193548
1+
clat-client_hostname:all=2930.193548
22
clat-client_hostname:localhost-1=2930.193548
3-
lat-client_hostname:all-server_hostname:all-server_port:all-server_port:all=2951.129032
3+
lat-client_hostname:all=2951.129032
44
lat-client_hostname:localhost-1=2951.129032
5-
slat-client_hostname:all-server_hostname:all-server_port:all-server_port:all=20.433333
5+
slat-client_hostname:all=20.433333
66
slat-client_hostname:localhost-1=20.433333

‎agent/tool-scripts/postprocess/gold/fio-0/result/reference-result/result.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
"client_hostname" : "all",
66
"description" : "Average completion latency per I/O operation",
77
"role" : "aggregate",
8-
"server_hostname" : "all",
9-
"server_port" : "all",
108
"timeseries" : [
119
{
1210
"date" : 1000,
@@ -133,7 +131,7 @@
133131
"value" : 4159
134132
}
135133
],
136-
"uid" : "client_hostname:%client_hostname%-server_hostname:%server_hostname%-server_port:%server_port%-server_port:%server_port%",
134+
"uid" : "client_hostname:%client_hostname%",
137135
"value" : 2930.1935483871
138136
},
139137
{
@@ -306,8 +304,6 @@
306304
"client_hostname" : "all",
307305
"description" : "Average total latency per I/O operation",
308306
"role" : "aggregate",
309-
"server_hostname" : "all",
310-
"server_port" : "all",
311307
"timeseries" : [
312308
{
313309
"date" : 1000,
@@ -434,7 +430,7 @@
434430
"value" : 4182
435431
}
436432
],
437-
"uid" : "client_hostname:%client_hostname%-server_hostname:%server_hostname%-server_port:%server_port%-server_port:%server_port%",
433+
"uid" : "client_hostname:%client_hostname%",
438434
"value" : 2951.12903225806
439435
},
440436
{
@@ -607,8 +603,6 @@
607603
"client_hostname" : "all",
608604
"description" : "Average submission latency per I/O operation",
609605
"role" : "aggregate",
610-
"server_hostname" : "all",
611-
"server_port" : "all",
612606
"timeseries" : [
613607
{
614608
"date" : 0,
@@ -735,7 +729,7 @@
735729
"value" : 21
736730
}
737731
],
738-
"uid" : "client_hostname:%client_hostname%-server_hostname:%server_hostname%-server_port:%server_port%-server_port:%server_port%",
732+
"uid" : "client_hostname:%client_hostname%",
739733
"value" : 20.4193548387097
740734
},
741735
{

‎agent/tool-scripts/postprocess/gold/uperf-0/csv/uperf_trans_sec.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
timestamp_client_hostname:all-server_hostname:all-server_port:all-server_port:all_ms,client_hostname:all-server_hostname:all-server_port:all-server_port:all,timestamp_client_hostname:perf102-server_hostname:perf104-server_port:21000_ms,client_hostname:perf102-server_hostname:perf104-server_port:21000,timestamp_client_hostname:perf102-server_hostname:perf104-server_port:22000_ms,client_hostname:perf102-server_hostname:perf104-server_port:22000
1+
timestamp_client_hostname:all-server_hostname:all-server_port:all_ms,client_hostname:all-server_hostname:all-server_port:all,timestamp_client_hostname:perf102-server_hostname:perf104-server_port:21000_ms,client_hostname:perf102-server_hostname:perf104-server_port:21000,timestamp_client_hostname:perf102-server_hostname:perf104-server_port:22000_ms,client_hostname:perf102-server_hostname:perf104-server_port:22000
22
1459955128435,21497.8078864193,1459955122429,11332.6673326673,1459955127646,10741.2587412587
33
1459955129436,21473.7031200568,1459955123430,11343.6563436563,1459955128647,10749.2507492508
44
1459955130437,21451.4546392668,1459955124431,10860.1398601399,1459955129648,10734.2657342657

0 commit comments

Comments
 (0)