ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/nvme: wait after reloading nvme module

Browse Source 
Make sure that all setting files under /sys/block/nvme*
have time to get created properly.

Change-Id: I9e3bf973fc09d2f5c38be3b29aa1fea4137c0402
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476557
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Karol Latecki 2019-12-03 09:42:05 +01:00 committed by Tomasz Zawadzki
parent cfb6aec8ab
commit a34d7d7b2f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/nvme/perf/common.sh
View File

@ -310,6 +310,20 @@ function run_bdevperf(){
sleep 1 sleep 1
} }
function wait_for_nvme_reload() {
local nvmes=$1
shopt -s extglob
for disk in $nvmes; do
cmd="ls /sys/block/$disk/queue/*@(iostats|rq_affinity|nomerges|io_poll_delay)*"
until $cmd 2>/dev/null; do
echo "Waiting for full nvme driver reload..."
sleep 0.5
done
done
shopt -q extglob
}
function usage() function usage()
{ {
set +x set +x

2
test/nvme/perf/run_perf.sh
View File

@ -70,6 +70,7 @@ elif [ $PLUGIN = "kernel-io-uring" ]; then
modprobe -rv nvme modprobe -rv nvme
modprobe nvme poll_queues=8 modprobe nvme poll_queues=8
wait_for_nvme_reload $disk_names
backup_dir="/tmp/nvme_param_bak" backup_dir="/tmp/nvme_param_bak"
mkdir -p $backup_dir mkdir -p $backup_dir
@ -196,6 +197,7 @@ if [ $PLUGIN = "kernel-io-uring" ]; then
# Reload the nvme driver so that other test runs are not affected # Reload the nvme driver so that other test runs are not affected
modprobe -rv nvme modprobe -rv nvme
modprobe nvme modprobe nvme
wait_for_nvme_reload $disk_names
for disk in $disk_names; do for disk in $disk_names; do
echo "INFO: Restoring device parameters for $disk" echo "INFO: Restoring device parameters for $disk"