scripts/vagrant: replace hardcoded ocssd metadata file paths
These can't be hardcoded to a single location. It makes running multiple VMs with OCSSD emulation impossible. Signed-off-by: Karol Latecki <karol.latecki@intel.com> Change-Id: I4ce0412fc9fc4542670a9e70c08219003e41828b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1488 Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
53dbdf6dce
commit
3d3e8096b7
2
scripts/vagrant/Vagrantfile
vendored
2
scripts/vagrant/Vagrantfile
vendored
@ -160,7 +160,7 @@ Vagrant.configure(2) do |config|
|
||||
# lnum_lun, lnum_pln, lpgs_per_blk, lsecs_per_pg, lblks_per_pln this are parameters describing the device geometry
|
||||
# we need to multiply these parameters by ourselves to have backend file minimal size:
|
||||
# in our case: 4K * 8 * 2 * 1536 * 2 * 45 = 8640 MB
|
||||
libvirt.qemuargs :value => "nvme,drive=#{nvme_disk_id},serial=deadbeef,oacs=0,namespaces=1,lver=2,lba_index=4,mdts=10,lnum_lun=8,lnum_pln=2,lpgs_per_blk=1536,lsecs_per_pg=2,lblks_per_pln=45,metadata=/var/lib/libvirt/images/ocssd_md,nsdatafile=/var/lib/libvirt/images/ocssd_blknvme.ns,laer_thread_sleep=3000,stride=4"
|
||||
libvirt.qemuargs :value => "nvme,drive=#{nvme_disk_id},serial=deadbeef,oacs=0,namespaces=1,lver=2,lba_index=4,mdts=10,lnum_lun=8,lnum_pln=2,lpgs_per_blk=1536,lsecs_per_pg=2,lblks_per_pln=45,metadata=#{nvme_disk}_ocssd_md,nsdatafile=#{nvme_disk}_ocssd_blknvme.ns,laer_thread_sleep=3000,stride=4"
|
||||
end
|
||||
}
|
||||
|
||||
|
@ -45,14 +45,14 @@ if [ ! "${SYSTEM}" = "FreeBSD" ]; then
|
||||
WHICH_OS=$(lsb_release -i | awk '{print $3}')
|
||||
case $type in
|
||||
"nvme")
|
||||
qemu-img create -f raw $nvme_disk ${size}
|
||||
qemu-img create -f raw $nvme_disk $size
|
||||
;;
|
||||
"ocssd")
|
||||
if [ ${size} == "1024M" ]; then
|
||||
if [ $size == "1024M" ]; then
|
||||
size="9G"
|
||||
fi
|
||||
fallocate -l ${size} $nvme_disk
|
||||
touch /var/lib/libvirt/images/ocssd_md
|
||||
fallocate -l $size $nvme_disk
|
||||
touch ${nvme_disk}_ocssd_md
|
||||
;;
|
||||
*)
|
||||
echo "We support only nvme and ocssd disks types"
|
||||
|
Loading…
x
Reference in New Issue
Block a user