Netperf: add tries parameter to repeat sub tests

1.sometimes since vm performance issue or processors could not handle
at same time with mis-config sessions number, it may not all clients
up at same times, we can modify tries parameters to repeat sub tests
to increase the successful probalility
2.add function stop_netperf_clients() to use correct kill command
according to linux or windows system
Signed-off-by: NWenli Quan <wquan@redhat.com>

generic/tests/cfg/netperf.cfg

@@ -6,6 +6,11 @@
     setup_ksm = no
     take_regular_screendumps = no
     store_vm_register = no
+    # sometimes since vm performance issue or processors could not handle
+    # at same time with mis-config sessions number, it may not all clients
+    # up at same times, please modify tires parameter to repeat sub tests
+    # to increase the successful probalility
+    tries = 5
     # Please update following comments params when you need special cfg for
     # your test nic cards
     # nic1 is for control, nic2 is for data connection
@@ -64,6 +69,8 @@
     log_hostinfo_script = scripts/rh_perf_log_hostinfo_script.sh
     host_tuned_profile = "tuned-adm profile virtual-host"
     client_tuned_profile = "tuned-adm profile virtual-host"
+    client_kill_linux = "killall netperf"
+    client_kill_windows = "taskkill /F /IM netperf*"
     # Now the get status functions are implemented for RHEL and Fedora guests.
     # Not test with other guests, please set this depends on your guest os
     # environment.

generic/tests/netperf.py

@@ -377,10 +377,10 @@ def start_test(server, server_ctl, host, clients, resultsdir, test_duration=60,
     guest_ver_cmd = params.get("guest_ver_cmd", "uname -r")
     fd = open("%s/netperf-result.%s.RHS" % (resultsdir, time.time()), "w")
 
-    test.write_test_keyval({'kvm-userspace-ver': ssh_cmd(host,
-                            ver_cmd).strip()})
-    test.write_test_keyval({'guest-kernel-ver': ssh_cmd(server_ctl,
-                            guest_ver_cmd).strip()})
+    test.write_test_keyval({'kvm-userspace-ver': ssh_cmd(
+                            host, ver_cmd).strip()})
+    test.write_test_keyval({'guest-kernel-ver': ssh_cmd(
+                            server_ctl, guest_ver_cmd).strip()})
     test.write_test_keyval({'session-length': test_duration})
 
     fd.write('### kvm-userspace-ver : %s\n' % ssh_cmd(host,
@@ -439,13 +439,13 @@ def start_test(server, server_ctl, host, clients, resultsdir, test_duration=60,
                 ret = launch_client(j, server, server_ctl, host, clients,
                                     test_duration, nf_args, netserver_port,
                                     params, server_cyg, test)
-
+                if ret:
                     thu = float(ret['thu'])
                     cpu = 100 - float(ret['mpstat'].split()[mpstat_index])
                     normal = thu / cpu
                     if ret.get('tx_pkt') and ret.get('exits'):
-                    ret['tpkt_per_exit'] = float
-                    (ret['tx_pkts']) / float(ret['exits'])
+                        ret['tpkt_per_exit'] = float(
+                                ret['tx_pkts']) / float(ret['exits'])
 
                     ret['size'] = int(i)
                     ret['sessions'] = int(j)
@@ -479,6 +479,11 @@ def start_test(server, server_ctl, host, clients, resultsdir, test_duration=60,
                                           verbose=False, ignore_status=True,
                                           shell=True)
                     logging.info("Netperf thread completed successfully")
+                else:
+                    logging.debug(
+                        "Not all netperf clients start to work, please enlarge"
+                        " '%s' number or skip this tests" % int(j))
+                    continue
     fd.close()
 
 
@@ -653,6 +658,14 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
             return True
         return False
 
+    def stop_netperf_clients():
+        if params.get("os_type_client") == "linux":
+            ssh_cmd(clients[-1], params.get("client_kill_linux"),
+                    ignore_status=True)
+        else:
+            ssh_cmd(clients[-1], params.get("client_kill_windows"),
+                    ignore_status=True)
+
     def parse_demo_result(fname, sessions):
         """
         Process the demo result, remove the noise from head,
@@ -682,13 +695,16 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
         logging.debug("niteration: %s" % niteration)
         return result
 
+    tries = int(params.get("tries", 1))
+    while tries > 0:
         error_context.context("Start netperf client threads", logging.info)
         pid = str(os.getpid())
         fname = "/tmp/netperf.%s.nf" % pid
         ssh_cmd(clients[-1], "rm -f %s" % fname)
         numa_enable = params.get("netperf_with_numa", "yes") == "yes"
         timeout_netperf_start = int(l) * 0.5
-    client_thread = threading.Thread(target=netperf_thread,
+        client_thread = threading.Thread(
+                target=netperf_thread,
                 kwargs={"i": int(sessions),
                         "numa_enable": numa_enable,
                         "client_s": clients[0],
@@ -701,8 +717,6 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
         if utils_misc.wait_for(all_clients_up, timeout_netperf_start, 0.0, 0.2,
                                "Wait until all netperf clients start to work"):
             logging.debug("All netperf clients start to work.")
-    else:
-        test.fail("Error, not all netperf clients at work")
 
             # real & effective test starts
             if get_status_flag:
@@ -711,10 +725,7 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
             finished_result = ssh_cmd(clients[-1], "cat %s" % fname)
 
             # stop netperf clients
-    kill_cmd = "killall netperf"
-    if params.get("os_type") == "windows":
-        kill_cmd = "taskkill /F /IM netperf*"
-    ssh_cmd(clients[-1], kill_cmd, ignore_status=True)
+            stop_netperf_clients()
 
             # real & effective test ends
             if get_status_flag:
@@ -731,9 +742,15 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
 
             client_thread.join()
 
-    error_context.context("Testing Results Treatment and Report", logging.info)
+            error_context.context("Testing Results Treatment and Report",
+                                  logging.info)
             f = open(fname, "w")
             f.write(finished_result)
             f.close()
             ret['thu'] = parse_demo_result(fname, int(sessions))
             return ret
+            break
+        else:
+            stop_netperf_clients()
+            tries = tries - 1
+            logging.debug("left %s times" % tries)