From d9027e814023ce516929ccfd1ed96c3c76fb5669 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 4 Oct 2022 17:13:59 +0200 Subject: [PATCH] scripts/nvmf_perf: group restore functions Group and move all restore_* functions to classes stop method. Signed-off-by: Karol Latecki Change-Id: I92cde5865a28343dbace702f54e4e06e4c2ba6cb Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14855 Reviewed-by: Tomasz Zawadzki Reviewed-by: Konrad Sztyber Tested-by: SPDK CI Jenkins --- scripts/perf/nvmf/run_nvmf.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index ab8b7a829..0b105482c 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -364,6 +364,14 @@ class Server: self.exec_cmd(["sudo", "cpupower", "frequency-set", "-g", self.governor_restore]) self.log.info("Reverted CPU governor to %s." % self.governor_restore) + def restore_settings(self): + self.restore_governor() + self.restore_tuned() + self.restore_services() + self.restore_sysctl() + if self.enable_adq: + self.reload_driver("ice") + class Target(Server): def __init__(self, name, general_config, target_config): @@ -640,6 +648,7 @@ class Initiator(Server): return json.loads(self.exec_cmd(["lshw", "-json"])) def stop(self): + self.restore_settings() self.ssh_connection.close() def exec_cmd(self, cmd, stderr_redirect=False, change_dir=None): @@ -882,6 +891,7 @@ class KernelTarget(Target): def stop(self): self.nvmet_command(self.nvmet_bin, "clear") + self.restore_settings() def get_nvme_device_bdf(self, nvme_dev_path): nvme_name = os.path.basename(nvme_dev_path) @@ -1212,6 +1222,7 @@ class SPDKTarget(Target): os.remove("/var/tmp/spdk.sock.lock") except FileNotFoundError: pass + self.restore_settings() class KernelInitiator(Initiator): @@ -1606,19 +1617,6 @@ if __name__ == "__main__": i.init_disconnect() i.copy_result_files(args.results) - target_obj.restore_governor() - target_obj.restore_tuned() - target_obj.restore_services() - target_obj.restore_sysctl() - if target_obj.enable_adq: - target_obj.reload_driver("ice") - for i in initiators: - i.restore_governor() - i.restore_tuned() - i.restore_services() - i.restore_sysctl() - if i.enable_adq: - i.reload_driver("ice") parse_results(args.results, args.csv_filename) finally: for i in initiators: