8:40 a.m.
This parameter controls which tests should be run. By default both TCP_RR and TCP_CRR
is run. To override this you can run the test with nperf_tests="TCP_CRR" alias
to run
only TCP_RR test.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
.../phase3/short_lived_connections.py | 134 +++++++++++----------
.../phase3/short_lived_connections.xml | 1 +
2 files changed, 69 insertions(+), 66 deletions(-)
diff --git a/recipes/regression_tests/phase3/short_lived_connections.py
b/recipes/regression_tests/phase3/short_lived_connections.py
index b2d78dd..efdd40f 100644
--- a/recipes/regression_tests/phase3/short_lived_connections.py
+++ b/recipes/regression_tests/phase3/short_lived_connections.py
@@ -37,6 +37,7 @@ nperf_mode = ctl.get_alias("nperf_mode")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_tests = ctl.get_alias("nperf_tests")
pr_user_comment = ctl.get_alias("perfrepo_comment")
official_result = bool_it(ctl.get_alias("official_result"))
adaptive_coalescing_off = bool_it(ctl.get_alias("adaptive_coalescing_off"))
@@ -112,73 +113,74 @@ netperf_srv = ctl.get_module("Netperf",
ctl.wait(15)
-for size in ["1K,1K", "5K,5K", "7K,7K",
"10K,10K", "12K,12K"]:
-
- netperf_cli_tcp_rr.update_options({"testoptions": "-r %s" %
size})
- netperf_cli_tcp_crr.update_options({"testoptions": "-r %s" %
size})
-
- if nperf_mode == "multi":
- netperf_cli_tcp_rr.unset_option("confidence")
- netperf_cli_tcp_crr.unset_option("confidence")
-
- netperf_cli_tcp_rr.update_options({"num_parallel":
nperf_num_parallel})
- netperf_cli_tcp_crr.update_options({"num_parallel":
nperf_num_parallel})
-
- # we have to use multiqueue qdisc to get appropriate data
- m1.run("tc qdisc replace dev %s root mq" % m1_testiface.get_devname())
- m2.run("tc qdisc replace dev %s root mq" % m2_testiface.get_devname())
-
- # Netperf test
- srv_proc = m1.run(netperf_srv, bg=True)
- ctl.wait(2)
-
- # prepare PerfRepo result for tcp_rr
- result_tcp_rr = perf_api.new_result("tcp_rr_id",
- "tcp_rr_result",
- hash_ignore=[
- 'kernel_release',
- 'redhat_release'])
- result_tcp_rr.add_tag(product_name)
- if nperf_mode == "multi":
- result_tcp_rr.add_tag("multithreaded")
- result_tcp_rr.set_parameter('num_parallel', nperf_num_parallel)
-
- result_tcp_rr.set_parameter("rr_size", size)
-
- baseline = perf_api.get_baseline_of_result(result_tcp_rr)
- netperf_baseline_template(netperf_cli_tcp_rr, baseline, test_type="RR")
+# start netperf server
+srv_proc = m1.run(netperf_srv, bg=True)
+ctl.wait(2)
- tcp_rr_res_data = m2.run(netperf_cli_tcp_rr,
- timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
-
- netperf_result_template(result_tcp_rr, tcp_rr_res_data, test_type="RR")
- result_tcp_rr.set_comment(pr_comment)
- perf_api.save_result(result_tcp_rr, official_result)
-
- # prepare PerfRepo result for tcp_crr
- result_tcp_crr = perf_api.new_result("tcp_crr_id",
- "tcp_crr_result",
- hash_ignore=[
- 'kernel_release',
- 'redhat_release'])
- result_tcp_crr.add_tag(product_name)
- if nperf_mode == "multi":
- result_tcp_crr.add_tag("multithreaded")
- result_tcp_crr.set_parameter('num_parallel', nperf_num_parallel)
-
- result_tcp_crr.set_parameter("rr_size", size)
-
- baseline = perf_api.get_baseline_of_result(result_tcp_crr)
- netperf_baseline_template(netperf_cli_tcp_crr, baseline, test_type="RR")
-
- tcp_crr_res_data = m2.run(netperf_cli_tcp_crr,
- timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
-
- netperf_result_template(result_tcp_crr, tcp_crr_res_data, test_type="RR")
- result_tcp_crr.set_comment(pr_comment)
- perf_api.save_result(result_tcp_crr, official_result)
-
- srv_proc.intr()
+for size in ["1K,1K", "5K,5K", "7K,7K",
"10K,10K", "12K,12K"]:
+ if 'TCP_RR' in nperf_tests.split():
+ netperf_cli_tcp_rr.update_options({"testoptions": "-r %s" %
size})
+ netperf_cli_tcp_crr.update_options({"testoptions": "-r %s" %
size})
+
+ if nperf_mode == "multi":
+ netperf_cli_tcp_rr.unset_option("confidence")
+ netperf_cli_tcp_crr.unset_option("confidence")
+
+ netperf_cli_tcp_rr.update_options({"num_parallel":
nperf_num_parallel})
+ netperf_cli_tcp_crr.update_options({"num_parallel":
nperf_num_parallel})
+
+ # we have to use multiqueue qdisc to get appropriate data
+ m1.run("tc qdisc replace dev %s root mq" %
m1_testiface.get_devname())
+ m2.run("tc qdisc replace dev %s root mq" %
m2_testiface.get_devname())
+
+ # prepare PerfRepo result for tcp_rr
+ result_tcp_rr = perf_api.new_result("tcp_rr_id",
+ "tcp_rr_result",
+ hash_ignore=[
+ 'kernel_release',
+ 'redhat_release'])
+ result_tcp_rr.add_tag(product_name)
+ if nperf_mode == "multi":
+ result_tcp_rr.add_tag("multithreaded")
+ result_tcp_rr.set_parameter('num_parallel', nperf_num_parallel)
+
+ result_tcp_rr.set_parameter("rr_size", size)
+
+ baseline = perf_api.get_baseline_of_result(result_tcp_rr)
+ netperf_baseline_template(netperf_cli_tcp_rr, baseline,
test_type="RR")
+
+ tcp_rr_res_data = m2.run(netperf_cli_tcp_rr,
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+
+ netperf_result_template(result_tcp_rr, tcp_rr_res_data,
test_type="RR")
+ result_tcp_rr.set_comment(pr_comment)
+ perf_api.save_result(result_tcp_rr, official_result)
+
+ if 'TCP_CRR' in nperf_tests.split():
+ # prepare PerfRepo result for tcp_crr
+ result_tcp_crr = perf_api.new_result("tcp_crr_id",
+ "tcp_crr_result",
+ hash_ignore=[
+ 'kernel_release',
+ 'redhat_release'])
+ result_tcp_crr.add_tag(product_name)
+ if nperf_mode == "multi":
+ result_tcp_crr.add_tag("multithreaded")
+ result_tcp_crr.set_parameter('num_parallel', nperf_num_parallel)
+
+ result_tcp_crr.set_parameter("rr_size", size)
+
+ baseline = perf_api.get_baseline_of_result(result_tcp_crr)
+ netperf_baseline_template(netperf_cli_tcp_crr, baseline,
test_type="RR")
+
+ tcp_crr_res_data = m2.run(netperf_cli_tcp_crr,
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+
+ netperf_result_template(result_tcp_crr, tcp_crr_res_data,
test_type="RR")
+ result_tcp_crr.set_comment(pr_comment)
+ perf_api.save_result(result_tcp_crr, official_result)
+
+srv_proc.intr()
if netdev_cpupin:
m1.run("service irqbalance start")
diff --git a/recipes/regression_tests/phase3/short_lived_connections.xml
b/recipes/regression_tests/phase3/short_lived_connections.xml
index 9bb43da..0016d6e 100644
--- a/recipes/regression_tests/phase3/short_lived_connections.xml
+++ b/recipes/regression_tests/phase3/short_lived_connections.xml
@@ -9,6 +9,7 @@
<alias name="nperf_num_parallel" value="2"/>
<alias name="nperf_debug" value="0"/>
<alias name="nperf_max_dev" value="20%"/>
+ <alias name="nperf_tests" value="TCP_RR TCP_CRR"/>
<alias name="mapping_file"
value="short_lived_connections.mapping" />
<alias name="net" value="192.168.101" />
<alias name="driver" value="ixgbe" />
--
2.14.4