From: Ondrej Lichtner olichtne@redhat.com
This patch adds two minor fixes for the multithreading support of the regression tests.
First is that cpu pinning should be ignored when running multiple netperf clients.
Second is that result objects sent to PerfRepo should carry information about the number of netperf clients used.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 14 ++++++++++- .../regression_tests/phase1/3_vlans_over_bond.py | 14 ++++++++++- recipes/regression_tests/phase1/bonding_test.py | 14 ++++++++++- .../phase1/virtual_bridge_2_vlans_over_bond.py | 12 ++++++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 14 ++++++++++- .../phase1/virtual_bridge_vlan_in_host.py | 14 ++++++++++- .../regression_tests/phase2/3_vlans_over_team.py | 14 ++++++++++- recipes/regression_tests/phase2/team_test.py | 28 ++++++++++++++++++++-- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 12 ++++++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 14 ++++++++++- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 14 ++++++++++- 11 files changed, 154 insertions(+), 10 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 163daa9..907ad3c 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -136,7 +136,7 @@ for vlan1 in vlans: netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
p_opts = "-L %s" % (m2_vlan2.get_ip(0)) - if nperf_cpupin: + if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), @@ -183,6 +183,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -203,6 +206,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -234,6 +240,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.set_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -255,6 +264,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.set_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 2c4131b..c14f1f0 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -138,7 +138,7 @@ for vlan1 in vlans: netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
p_opts = "-L %s" % (m2_vlan2.get_ip(0)) - if nperf_cpupin: + if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), @@ -187,6 +187,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -208,6 +211,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -239,6 +245,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -260,6 +269,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 2ee8ee5..cc93af0 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -75,7 +75,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (test_if2.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp = ctl.get_module("Netperf", @@ -164,6 +164,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -183,6 +186,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -210,6 +216,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -229,6 +238,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py index dd427e0..1b908cf 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -256,6 +256,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -279,6 +282,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -312,6 +318,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -335,6 +344,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index 1f7595b..d3cc786 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -80,7 +80,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (h2_vlan10.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s" % nperf_cpupin
netperf_cli_tcp = ctl.get_module("Netperf", @@ -184,6 +184,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -207,6 +210,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -237,6 +243,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -260,6 +269,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index e192bba..ca169af 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -79,7 +79,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (h2_vlan10.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s" % nperf_cpupin
netperf_cli_tcp = ctl.get_module("Netperf", @@ -184,6 +184,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -207,6 +210,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -237,6 +243,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -260,6 +269,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 7f5cf8f..dc163c0 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -139,7 +139,7 @@ for vlan1 in vlans: netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
p_opts = "-L %s" % (m2_vlan2.get_ip(0)) - if nperf_cpupin: + if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0), @@ -187,6 +187,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -208,6 +211,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -238,6 +244,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -259,6 +268,9 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_server_on_vlan', vlan1) result_udp.set_parameter('netperf_client_on_vlan', vlan2) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 5fa9b4e..8a1d275 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -75,7 +75,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (test_if2.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp = ctl.get_module("Netperf", @@ -166,6 +166,9 @@ for setting in offload_settings: result_tcp.set_parameter('netperf_server', "testmachine1") result_tcp.set_parameter('netperf_client', "testmachine2") result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -187,6 +190,9 @@ for setting in offload_settings: result_udp.set_parameter('netperf_server', "testmachine1") result_udp.set_parameter('netperf_client', "testmachine2") result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -215,6 +221,9 @@ for setting in offload_settings: result_tcp.set_parameter('netperf_server', "testmachine1") result_tcp.set_parameter('netperf_client', "testmachine2") result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -236,6 +245,9 @@ for setting in offload_settings: result_udp.set_parameter('netperf_server', "testmachine1") result_udp.set_parameter('netperf_client', "testmachine2") result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) @@ -266,7 +278,7 @@ netperf_srv.update_options({"bind" : test_if2.get_ip(0)}) netperf_srv6.update_options({"bind" : test_if2.get_ip(1)})
p_opts = "-L %s" % (test_if1.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
netperf_cli_tcp.update_options({"netperf_server" : test_if2.get_ip(0), @@ -305,6 +317,9 @@ for setting in offload_settings: result_tcp.set_parameter('netperf_server', "testmachine2") result_tcp.set_parameter('netperf_client', "testmachine1") result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -326,6 +341,9 @@ for setting in offload_settings: result_udp.set_parameter('netperf_server', "testmachine2") result_udp.set_parameter('netperf_client', "testmachine1") result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -354,6 +372,9 @@ for setting in offload_settings: result_tcp.set_parameter('netperf_server', "testmachine2") result_tcp.set_parameter('netperf_client', "testmachine1") result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -375,6 +396,9 @@ for setting in offload_settings: result_udp.set_parameter('netperf_server', "testmachine2") result_udp.set_parameter('netperf_client', "testmachine1") result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index 5c16355..240f056 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -234,6 +234,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -257,6 +260,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -290,6 +296,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -313,6 +322,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index a94b70c..76aa386 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -77,7 +77,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (h2_vlan10.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s" % nperf_cpupin
netperf_cli_tcp = ctl.get_module("Netperf", @@ -172,6 +172,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -195,6 +198,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -225,6 +231,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -248,6 +257,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 9697f28..dcde1b2 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -76,7 +76,7 @@ netperf_srv6 = ctl.get_module("Netperf", })
p_opts = "-L %s" % (h2_vlan10.get_ip(0)) -if nperf_cpupin: +if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s" % nperf_cpupin
netperf_cli_tcp = ctl.get_module("Netperf", @@ -171,6 +171,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp, baseline) @@ -194,6 +197,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp, baseline) @@ -225,6 +231,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) result_tcp.add_tag(product_name) + if nperf_mode == "multi": + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_tcp) netperf_baseline_template(netperf_cli_tcp6, baseline) @@ -248,6 +257,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1]) result_udp.add_tag(product_name) + if nperf_mode == "multi": + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel)
baseline = perf_api.get_baseline_of_result(result_udp) netperf_baseline_template(netperf_cli_udp6, baseline)
Wed, Nov 25, 2015 at 04:53:38PM CET, olichtne@redhat.com wrote:
From: Ondrej Lichtner olichtne@redhat.com
This patch adds two minor fixes for the multithreading support of the regression tests.
First is that cpu pinning should be ignored when running multiple netperf clients.
Second is that result objects sent to PerfRepo should carry information about the number of netperf clients used.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com
recipes/regression_tests/phase1/3_vlans.py | 14 ++++++++++- .../regression_tests/phase1/3_vlans_over_bond.py | 14 ++++++++++- recipes/regression_tests/phase1/bonding_test.py | 14 ++++++++++- .../phase1/virtual_bridge_2_vlans_over_bond.py | 12 ++++++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 14 ++++++++++- .../phase1/virtual_bridge_vlan_in_host.py | 14 ++++++++++- .../regression_tests/phase2/3_vlans_over_team.py | 14 ++++++++++- recipes/regression_tests/phase2/team_test.py | 28 ++++++++++++++++++++-- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 12 ++++++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 14 ++++++++++- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 14 ++++++++++- 11 files changed, 154 insertions(+), 10 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 163daa9..907ad3c 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -136,7 +136,7 @@ for vlan1 in vlans: netperf_srv6.update_options({"bind": m1_vlan1.get_ip(1)})
p_opts = "-L %s" % (m2_vlan2.get_ip(0))
if nperf_cpupin:
if nperf_cpupin and nperf_mode != "multi": p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin) netperf_cli_tcp.update_options({"netperf_server": m1_vlan1.get_ip(0),
@@ -183,6 +183,9 @@ for vlan1 in vlans: result_tcp.set_parameter('netperf_server_on_vlan', vlan1) result_tcp.set_parameter('netperf_client_on_vlan', vlan2) result_tcp.add_tag(product_name)
if nperf_mode == "multi":
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
Since nperf_num_parallel is converted to int() this patch introduced regression:
Traceback (most recent call last): File "/usr/bin/lnst-ctl", line 125, in get_recipe_result res = exec_action(action, nettestctl) File "/usr/bin/lnst-ctl", line 81, in exec_action return nettestctl.run_recipe() File "/usr/lib/python2.7/site-packages/lnst/Controller/NetTestController.py", line 639, in run_recipe res = self._run_recipe() File "/usr/lib/python2.7/site-packages/lnst/Controller/NetTestController.py", line 657, in _run_recipe res = self._run_task(task) File "/usr/lib/python2.7/site-packages/lnst/Controller/NetTestController.py", line 705, in _run_task return self._run_python_task(task) File "/usr/lib/python2.7/site-packages/lnst/Controller/NetTestController.py", line 694, in _run_python_task module = imp.load_source(name, task_path.resolve()) File "/usr/share/lnst/recipes/regression_tests/phase1/3_vlans_over_bond.py", line 194, in <module> baseline = perf_api.get_baseline_of_result(result_tcp) File "/usr/lib/python2.7/site-packages/lnst/Controller/Task.py", line 648, in get_baseline_of_result res_hash = result.generate_hash() File "/usr/lib/python2.7/site-packages/lnst/Controller/Task.py", line 774, in generate_hash sha1.update(i[1]) TypeError: must be string or buffer, not int
I am now testing with the int() conversion removed as this could be solution for the issue.
-Jan
lnst-developers@lists.fedorahosted.org