Commit 6d8dc523 authored by Karol Latecki's avatar Karol Latecki Committed by Changpeng Liu
Browse files

test/vhost: keep fio config file name for log output 



Copy fio config to guest VM with the same name instead of
renaming to /root/fio.job.
Use the same file name for creating log file in desired directory.

Remove not needed ls command in common/run_fio while at it.

Change-Id: I9e13d8cd6f7892a77d89afb99f7d57ef79f7b11f
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/393469


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 31662674

test/vhost/common/common.sh

+5 −4
Original line number Diff line number Diff line
@@ -799,19 +799,20 @@ function run_fio() 
		esac

	done



	local job_fname=$(basename "$job_file")



	# prepare job file for each VM

	for vm in ${vms[@]}; do

		local vm_num=${vm%%:*}

		local vmdisks=${vm#*:}



		sed "s@filename=@filename=$vmdisks@" $job_file | vm_ssh $vm_num 'cat > /root/fio.job'

		sed "s@filename=@filename=$vmdisks@" $job_file | vm_ssh $vm_num "cat > /root/$job_fname"

		fio_disks+="127.0.0.1:$(vm_fio_socket $vm_num):$vmdisks,"



		vm_ssh $vm_num ls -al

		vm_ssh $vm_num cat /root/fio.job

		vm_ssh $vm_num cat /root/$job_fname

	done



	python $SPDK_BUILD_DIR/test/vhost/common/run_fio.py --job-file=/root/fio.job $fio_bin $out ${fio_disks%,}

	python $SPDK_BUILD_DIR/test/vhost/common/run_fio.py --job-file=/root/$job_fname $fio_bin $out ${fio_disks%,}

}



# Shutdown or kill any running VM and SPDK APP.

test/vhost/common/run_fio.py

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ def save_file(path, mode, contents): 


def run_fio(vms, fio_cfg_fname, out_path, perf_vmex=False):

        global fio_bin

        fio_cfg_prefix = fio_cfg_fname.split(".")[0]

        job_name = os.path.splitext(os.path.basename(fio_cfg_fname))[0]



        # Build command for FIO

        fio_cmd = " ".join([fio_bin, "--eta=never"])
@@ -82,7 +82,7 @@ def run_fio(vms, fio_cfg_fname, out_path, perf_vmex=False): 
            print("ERROR! While executing FIO jobs - RC: {rc}".format(rc=rc, out=out))

            sys.exit(rc)

        else:

            save_file(os.path.join(out_path, ".".join([fio_cfg_prefix, "log"])), "w", out)

            save_file(os.path.join(out_path, ".".join([job_name, "log"])), "w", out)



        if perf_vmex:

            # Stop gathering perf statistics and prepare some result files
@@ -96,7 +96,7 @@ def run_fio(vms, fio_cfg_fname, out_path, perf_vmex=False): 
                               blocking=True)

            print("VMexit host stats:")

            print("{perf_out}".format(perf_out=out))

            save_file(os.path.join(perf_dir, "vmexit_stats_" + fio_cfg_prefix),

            save_file(os.path.join(perf_dir, "vmexit_stats_" + job_name),

                      "w", "{perf_out}".format(perf_out=out))

            try:

                os.remove(perf_rec_file)