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

scripts/nvmf_perf: indent multi-line strings 



I just really couldn't watch at the lack of
indentation in these lines.

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


Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarJaroslaw Chachulski <jaroslawx.chachulski@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 0ebf2509

scripts/perf/nvmf/run_nvmf.py

+23 −27
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import re 
import sys

import argparse

import json

import inspect

import logging

import zipfile

import threading
@@ -931,7 +932,7 @@ class Initiator(Server): 
                          "numa_mem_policy=prefer:%s" % section_local_numa])



    def gen_fio_config(self, rw, block_size, io_depth, subsys_no, fio_settings):

        fio_conf_template = """

        fio_conf_template = inspect.cleandoc("""

            [global]

            ioengine={ioengine}

            {spdk_conf}
@@ -948,7 +949,7 @@ time_based=1 
            ramp_time={ramp_time}

            runtime={run_time}

            rate_iops={rate_iops}

"""

        """)



        if self.cpus_allowed is not None:

            self.log.info("Limiting FIO workload execution on specific cores %s" % self.cpus_allowed)
@@ -973,17 +974,12 @@ rate_iops={rate_iops} 
        # io_u error on file /dev/nvme2n1: Operation not supported

        # See comment in KernelInitiator class, init_connect() function

        if "io_uring" in self.ioengine:

            fio_config = fio_config + """

fixedbufs=1

registerfiles=1

#hipri=1

        """

            fio_config = "\n".join([fio_config, "fixedbufs=1", "registerfiles=1", "#hipri=1"])

        if fio_settings["num_jobs"]:

            fio_config = fio_config + "numjobs=%s \n" % fio_settings["num_jobs"]

            fio_config = "\n".join([fio_config, f"numjobs={fio_settings['num_jobs']}"])

        if self.cpus_allowed is not None:

            fio_config = fio_config + "cpus_allowed=%s \n" % self.cpus_allowed

            fio_config = fio_config + "cpus_allowed_policy=%s \n" % self.cpus_allowed_policy

        fio_config = fio_config + filename_section

            fio_config = "\n".join([fio_config, f"cpus_allowed={self.cpus_allowed}", f"cpus_allowed_policy={self.cpus_allowed_policy}"])

        fio_config = "\n".join([fio_config, filename_section])



        fio_config_filename = "%s_%s_%s_m_%s" % (block_size, io_depth, rw, fio_settings["rw_mix_read"])

        if hasattr(self, "num_cores"):