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

scripts/nvmf_perf: silence PCM utility 



Redirect stdout and stderr streams so they're not
printed to screen. This utility generates a lot of
(mostly) useless output, so write everything to
files.

Change-Id: I2bd5392f04d7e421b133dcf1cba1d7fc789953ec
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19065


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent bd1b0714

scripts/perf/nvmf/run_nvmf.py

+5 −1
Original line number Diff line number Diff line
@@ -706,13 +706,17 @@ class Target(Server): 
        time.sleep(ramp_time)

        cmd = ["pcm", "1", "-i=%s" % run_time,

               "-csv=%s/%s" % (results_dir, pcm_file_name)]

        subprocess.run(cmd)

        out = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

        df = pd.read_csv(os.path.join(results_dir, pcm_file_name), header=[0, 1])

        df = df.rename(columns=lambda x: re.sub(r'Unnamed:[\w\s]*$', '', x))

        skt = df.loc[:, df.columns.get_level_values(1).isin({'UPI0', 'UPI1', 'UPI2'})]

        skt_pcm_file_name = "_".join(["skt", pcm_file_name])

        skt.to_csv(os.path.join(results_dir, skt_pcm_file_name), index=False)



        if out.returncode:

            self.log.warning("PCM Power measurement finished with a non-zero return code.")

            self.log.warning(out.stdout.decode(encoding="utf-8"))



    def measure_network_bandwidth(self, results_dir, bandwidth_file_name, ramp_time, run_time):

        self.log.info("Waiting %d seconds for ramp-up to finish before measuring bandwidth stats" % ramp_time)

        time.sleep(ramp_time)