Commit f67c74a2 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

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: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15543


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 55018c6e

scripts/perf/nvmf/run_nvmf.py

+3 −2
Original line number Diff line number Diff line
@@ -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)])