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

test/ioat: remove unnecessary config entires

Browse Source 
Since IOAT is disabled by default, that option can be removed from
any config file used in tests.

Change-Id: I681bd1eb6a8c81328ba580be75b418994ccd85e3
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/423357
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Tomasz Zawadzki 2018-08-27 07:29:12 -04:00 committed by Jim Harris
parent b5d1b4f445
commit 897eed3179
9 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/blobfs.md
View File

@ -29,17 +29,10 @@ cd rocksdb
make db_bench SPDK_DIR=path/to/spdk make db_bench SPDK_DIR=path/to/spdk
~~~ ~~~
Copy `etc/spdk/rocksdb.conf.in` from the SPDK repository to `/usr/local/etc/spdk/rocksdb.conf`. Create an NVMe section in the configuration file using SPDK's `gen_nvme.sh` script.
~~~{.sh} ~~~{.sh}
cd ../spdk scripts/gen_nvme.sh > /usr/local/etc/spdk/rocksdb.conf
cp etc/spdk/rocksdb.conf.in /usr/local/etc/spdk/rocksdb.conf
~~~
Append an NVMe section to the configuration file using SPDK's `gen_nvme.sh` script.
~~~{.sh}
scripts/gen_nvme.sh >> /usr/local/etc/spdk/rocksdb.conf
~~~ ~~~
Verify the configuration file has specified the correct NVMe SSD. Verify the configuration file has specified the correct NVMe SSD.

18
etc/spdk/rocksdb.conf.in
View File

@ -1,18 +0,0 @@
# spdk configuration file
#
# Please write all parameters using ASCII.
# The parameter must be quoted if it includes whitespace.
#
# Configuration syntax:
# Spaces at head of line are deleted, other spaces are as separator
# Lines starting with '#' are comments and not evaluated.
# Lines ending with '\' are concatenated with the next line.
# Bracketed keys are section keys grouping the following value keys.
# Number of section key is used as a tag number.
# Ex. [TargetNode1] = TargetNode section key with tag number 1
[Global]
[Ioat]
Enable No
# [Nvme] section will get appended here by scripts/gen_nvme.sh.

3
test/bdev/bdev.conf.in
View File

@ -18,9 +18,6 @@
AIO /dev/ram0 AIO0 AIO /dev/ram0 AIO0
AIO /tmp/aiofile AIO1 2048 AIO /tmp/aiofile AIO1 2048
[Ioat]
Enable No
[QoS] [QoS]
# QoS section defines limitation on performance # QoS section defines limitation on performance
# metric like IOPS # metric like IOPS

3
test/blobfs/rocksdb/rocksdb.sh
View File

@ -45,8 +45,7 @@ popd
timing_exit db_bench_build timing_exit db_bench_build
cp $rootdir/etc/spdk/rocksdb.conf.in $ROCKSDB_CONF $rootdir/scripts/gen_nvme.sh > $ROCKSDB_CONF
$rootdir/scripts/gen_nvme.sh >> $ROCKSDB_CONF
trap 'run_bsdump; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT trap 'run_bsdump; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT

2
test/iscsi_tgt/initiator/bdev.conf.in
View File

@ -1,2 +0,0 @@
[Ioat]
Enable No

3
test/iscsi_tgt/initiator/initiator.sh
View File

@ -39,8 +39,7 @@ sleep 1
trap "killprocess $pid; rm -f $testdir/bdev.conf; exit 1" SIGINT SIGTERM EXIT trap "killprocess $pid; rm -f $testdir/bdev.conf; exit 1" SIGINT SIGTERM EXIT
# Prepare config file for iSCSI initiator # Prepare config file for iSCSI initiator
cp $testdir/bdev.conf.in $testdir/bdev.conf echo "[iSCSI_Initiator]" > $testdir/bdev.conf
echo "[iSCSI_Initiator]" >> $testdir/bdev.conf
echo " URL iscsi://$TARGET_IP/iqn.2016-06.io.spdk:disk1/0 iSCSI0" >> $testdir/bdev.conf echo " URL iscsi://$TARGET_IP/iqn.2016-06.io.spdk:disk1/0 iSCSI0" >> $testdir/bdev.conf
$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -o 4096 -w verify -t 5 -s 512 $rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -o 4096 -w verify -t 5 -s 512
if [ $RUN_NIGHTLY -eq 1 ]; then if [ $RUN_NIGHTLY -eq 1 ]; then

3
test/vhost/hotplug/vhost.conf.base
View File

@ -1,7 +1,4 @@
[Global] [Global]
[Ioat]
Enable No
[Nvme] [Nvme]
HotplugEnable Yes HotplugEnable Yes

3
test/vhost/initiator/bdev.conf
View File

@ -19,6 +19,3 @@
Path naa.Nvme0n1_blk1.0 Path naa.Nvme0n1_blk1.0
Type Blk Type Blk
Queues 8 Queues 8
[Ioat]
Enable No

3
test/vhost/initiator/bdev_pci.conf
View File

@ -1,5 +1,2 @@
[VirtioPci] [VirtioPci]
Enable Yes Enable Yes
[Ioat]
Enable No