From f67c74a2cf065e1bb2f3fb5a24a1bdcbbe73ba62 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Mon, 21 Nov 2022 10:37:56 +0100 Subject: [PATCH] scripts/nvmf_perf: import missing subprocess exception CalledProcessError was removed from common.py and not moved to run_nvmf.py in: https://review.spdk.io/gerrit/c/spdk/spdk/+/14740 Change-Id: Ib35c60aa779711f40c6fda990c721491ae000b43 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15543 Tested-by: SPDK CI Jenkins Reviewed-by: Pawel Piatek Reviewed-by: Michal Berger Reviewed-by: Konrad Sztyber Reviewed-by: Tomasz Zawadzki --- scripts/perf/nvmf/run_nvmf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/perf/nvmf/run_nvmf.py b/scripts/perf/nvmf/run_nvmf.py index 2ac267954..ec5777462 100755 --- a/scripts/perf/nvmf/run_nvmf.py +++ b/scripts/perf/nvmf/run_nvmf.py @@ -21,6 +21,7 @@ import uuid import paramiko import pandas as pd from common import * +from subprocess import CalledProcessError sys.path.append(os.path.dirname(__file__) + '/../../../python') @@ -835,7 +836,7 @@ registerfiles=1 output = self.exec_cmd(["sudo", self.fio_bin, fio_config_file, "--output-format=json", "--output=%s" % output_filename, "--eta=never"], True) self.log.info(output) - except subprocess.CalledProcessError as e: + except CalledProcessError as e: self.log.error("ERROR: Fio process failed!") self.log.info(e.stdout) else: @@ -1228,7 +1229,7 @@ class KernelInitiator(Initiator): sysfs_opt_path = os.path.join(sysfs, k) try: self.exec_cmd(["sudo", "bash", "-c", "echo %s > %s" % (v, sysfs_opt_path)], stderr_redirect=True) - except subprocess.CalledProcessError as e: + except CalledProcessError as e: self.log.warning("Warning: command %s failed due to error %s. %s was not set!" % (e.cmd, e.output, v)) finally: _ = self.exec_cmd(["sudo", "cat", "%s" % (sysfs_opt_path)])