Commit 487da024 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/vhost: Adjustments for bigger nvmes 



E.g. when vhost tests work with a 8TB drive the bdev_lvol_delete()
needs a bit more time to complete, hence the default timeout must
be adjusted.

Also, in case we are working with *TB drives, the unit of the target
partitions can also change due to their size - instead of hard-coded
"G", use $(S) to match on any string (but keep the $(FP) as well to
indicate we are still looking for a floating number).

Change-Id: Ic11e71126071717846d53e3b152a37ae6521314b
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17988


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJaroslaw Chachulski <jaroslawx.chachulski@intel.com>
parent 4b481146

test/spdkcli/match_files/spdkcli_vhost.test.match

+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ $(OPX) | | o- Nvme0n1 $(S) [$(UUID), Size=$(S), Claimed] 
  | o- raid_volume ...................................................................................................... [Bdevs: 0]

  | o- rbd .............................................................................................................. [Bdevs: 0]

  | o- split_disk ....................................................................................................... [Bdevs: 4]

  | | o- Nvme0n1p0 $(S) [$(UUID), Size=$(FP)G, Not claimed]

  | | o- Nvme0n1p1 $(S) [$(UUID), Size=$(FP)G, Not claimed]

  | | o- Nvme0n1p2 $(S) [$(UUID), Size=$(FP)G, Not claimed]

  | | o- Nvme0n1p3 $(S) [$(UUID), Size=$(FP)G, Not claimed]

  | | o- Nvme0n1p0 $(S) [$(UUID), Size=$(FP)$(S), Not claimed]

  | | o- Nvme0n1p1 $(S) [$(UUID), Size=$(FP)$(S), Not claimed]

  | | o- Nvme0n1p2 $(S) [$(UUID), Size=$(FP)$(S), Not claimed]

  | | o- Nvme0n1p3 $(S) [$(UUID), Size=$(FP)$(S), Not claimed]

  | o- uring ............................................................................................................ [Bdevs: 0]

  | o- virtioblk_disk ................................................................................................... [Bdevs: 0]

  | o- virtioscsi_disk .................................................................................................. [Bdevs: 0]

test/vhost/lvol/lvol_test.sh

+2 −2
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ function usage() { 
function clean_lvol_cfg() {

	notice "Removing lvol bdevs"

	for lvol_bdev in "${lvol_bdevs[@]}"; do

		$rpc_py bdev_lvol_delete $lvol_bdev

		$rpc_py -t 120 bdev_lvol_delete $lvol_bdev

		notice "lvol bdev $lvol_bdev removed"

	done



	notice "Removing lvol stores"

	$rpc_py bdev_lvol_delete_lvstore -u "$ls_guid"

	$rpc_py -t 120 bdev_lvol_delete_lvstore -u "$ls_guid"

	notice "lvol store $ls_guid removed"

}