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

scripts/fio.py: fix sysfs delay

Browse Source 
After iSCSI login sysfs is not updated immediately, but when session is
initialized. It can take a while and causes that sometimes scripts
cannot write to sysfs.

Change-Id: Ie4fa512704f022041bb3d9ab02dbb4210ddd04a0
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454890
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Tomasz Kulasek 2019-05-14 13:47:34 +02:00 committed by Jim Harris
parent 74da904316
commit 843ca21287
8 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/fio.py
View File

@ -4,6 +4,8 @@ from subprocess import check_call, call, check_output, Popen, PIPE, CalledProces
import re
import sys
import signal
import os.path
import time
fio_template = """
[global]
@ -135,6 +137,16 @@ def set_device_parameter(devices, filename_template, value):
def configure_devices(devices):
for dev in devices:
retry = 30
while retry > 0:
if os.path.exists("/sys/block/%s/queue/nomerges" % dev):
break
else:
retry = retry - 1
time.sleep(0.1)
set_device_parameter(devices, "/sys/block/%s/queue/nomerges", "2")
set_device_parameter(devices, "/sys/block/%s/queue/nr_requests", "128")
requested_qd = 128

1
test/iscsi_tgt/digests/digests.sh
View File

@ -14,7 +14,6 @@ function node_login_fio_logout() {
iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.$arg
done
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
sleep 1
$fio_py iscsi 512 1 write 2 1
$fio_py iscsi 512 1 read 2 1
iscsiadm -m node --logout -p $TARGET_IP:$ISCSI_PORT

1
test/iscsi_tgt/fio/fio.sh
View File

@ -95,7 +95,6 @@ iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
trap "iscsicleanup; killprocess $pid; iscsitestfini $1 $2; delete_tmp_files; exit 1" SIGINT SIGTERM EXIT
sleep 1
$fio_py iscsi 4096 1 randrw 1 1 verify
$fio_py iscsi 131072 32 randrw 1 1 verify
$fio_py iscsi 524288 128 randrw 1 1 verify

1
test/iscsi_tgt/ip_migration/ip_migration.sh
View File

@ -74,7 +74,6 @@ sleep 1
iscsiadm -m node --login -p $MIGRATION_ADDRESS:$ISCSI_PORT
# fio tests for multi-process
sleep 1
$fio_py iscsi 4096 32 randrw 10 1 &
fiopid=$!
sleep 5

1
test/iscsi_tgt/multiconnection/multiconnection.sh
View File

@ -71,7 +71,6 @@ sleep 1
echo "Logging into iSCSI target."
iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
sleep 1
echo "Running FIO"
$fio_py iscsi 131072 64 randrw 5 1

1
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -83,7 +83,6 @@ run_nvme_remote "local"
trap "iscsicleanup; killprocess $iscsipid; \
rm -f ./local-job0-0-verify.state; iscsitestfini $1 $2; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
sleep 1
echo "Running FIO"
$fio_py iscsi 4096 1 randrw 1 1 verify

1
test/iscsi_tgt/rbd/rbd.sh
View File

@ -54,7 +54,6 @@ iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
trap "iscsicleanup; killprocess $pid; rbd_cleanup; exit 1" SIGINT SIGTERM EXIT
sleep 1
$fio_py iscsi 4096 1 randrw 1 1 verify
$fio_py iscsi 131072 32 randrw 1 1 verify

1
test/iscsi_tgt/reset/reset.sh
View File

@ -53,7 +53,6 @@ iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
sleep 1
dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
sleep 1
$fio_py iscsi 512 1 read 60 1 &
fiopid=$!
echo "FIO pid: $fiopid"