From 6e702e3cef7b37d422bc738c828085f04c29f4fb Mon Sep 17 00:00:00 2001 From: Denis Valitov Date: Tue, 18 Aug 2020 12:32:43 +0000 Subject: [PATCH 1/2] Add support for shared disks --- run | 82 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/run b/run index ba06855..fc58d16 100755 --- a/run +++ b/run @@ -96,6 +96,8 @@ options: -f, --force stop running VM -c, --clean remove kernel and initramfs volumes after VM shutdown + --shared using scsi disks as shared disk (The qcow2 + format is also replaced with raw.) Work if -f is enabled. -G, --gdb [HOST]:PORT Enable QEMU GDB stub via HOST:PORT -k, --kopt PARAM pass a kernel option -K, --keep don't shutdown VM immediately @@ -225,6 +227,9 @@ parse_options(){ elif [ "$1" == "-K" -o "$1" == "--keep" ]; then [ -t 1 ] && KOPT+=("ktest.keep") shift + elif [ "$1" == "--shared" ]; then + SHARED=1 + shift elif [ "$1" == "--disable-kdump" ]; then DISABLE_KDUMP=y shift @@ -259,6 +264,7 @@ parse_options(){ exit 1 fi + DISK_OWNER=$OWNER KERNEL="${POSITIONAL[0]}" [ -r "$KERNEL" ] || die "Can't read kernel: $KERNEL" [ -n "$ENTRY_POINT" ] && KOPT+=("ktest.start=$ENTRY_POINT") @@ -394,28 +400,52 @@ make_xml(){ local bus=scsi ((sidx++)) fi - xml ed --inplace \ - -s //devices -t elem -n disk -v '' \ - -a '//devices/disk[last()]' -t attr -n type -v volume \ - -a '//devices/disk[last()]' -t attr -n device -v disk \ - -s '//devices/disk[last()]' -t elem -n driver -v '' \ - -a '//devices/disk[last()]/driver' -t attr -n name -v qemu \ - -a '//devices/disk[last()]/driver' -t attr -n type -v "${v[2]}" \ - -s '//devices/disk[last()]' -t elem -n source -v '' \ - -a '//devices/disk[last()]/source' -t attr -n pool -v "$4" \ - -a '//devices/disk[last()]/source' -t attr -n volume -v "${v[0]}" \ - -s '//devices/disk[last()]' -t elem -n target -v '' \ - -a '//devices/disk[last()]/target' -t attr -n bus -v $bus \ - -a '//devices/disk[last()]/target' -t attr -n dev -v $dev \ - "$xml" + + if [ -n "$SHARED" ] && [ "$bus" == "scsi" ]; then + xml ed --inplace \ + -s //devices -t elem -n disk -v '' \ + -a '//devices/disk[last()]' -t attr -n type -v file \ + -a '//devices/disk[last()]' -t attr -n device -v disk \ + -a '//devices/disk[last()]' -t attr -n snapshot -v no \ + -s '//devices/disk[last()]' -t elem -n driver -v '' \ + -a '//devices/disk[last()]/driver' -t attr -n name -v qemu \ + -a '//devices/disk[last()]/driver' -t attr -n type -v "${v[2]}" \ + -a '//devices/disk[last()]/driver' -t attr -n cache -v writeback \ + -a '//devices/disk[last()]/driver' -t attr -n error_policy -v stop \ + -s '//devices/disk[last()]' -t elem -n source -v '' \ + -a '//devices/disk[last()]/source' -t attr -n file -v /var/lib/libvirt/images/"${v[0]}" \ + -s '//devices/disk[last()]' -t elem -n backingStore -v '' \ + -s '//devices/disk[last()]' -t elem -n target -v '' \ + -a '//devices/disk[last()]/target' -t attr -n bus -v $bus \ + -a '//devices/disk[last()]/target' -t attr -n dev -v $dev \ + -s '//devices/disk[last()]' -t elem -n shareable -v '' \ + -s '//devices/disk[last()]' -t elem -n vendor -v 'YADRO' \ + -s '//devices/disk[last()]' -t elem -n product -v 'shared_disk' \ + "$xml" + else + xml ed --inplace \ + -s //devices -t elem -n disk -v '' \ + -a '//devices/disk[last()]' -t attr -n type -v volume \ + -a '//devices/disk[last()]' -t attr -n device -v disk \ + -s '//devices/disk[last()]' -t elem -n driver -v '' \ + -a '//devices/disk[last()]/driver' -t attr -n name -v qemu \ + -a '//devices/disk[last()]/driver' -t attr -n type -v "${v[2]}" \ + -s '//devices/disk[last()]' -t elem -n source -v '' \ + -a '//devices/disk[last()]/source' -t attr -n pool -v "$4" \ + -a '//devices/disk[last()]/source' -t attr -n volume -v "${v[0]}" \ + -s '//devices/disk[last()]' -t elem -n target -v '' \ + -a '//devices/disk[last()]/target' -t attr -n bus -v $bus \ + -a '//devices/disk[last()]/target' -t attr -n dev -v $dev \ + "$xml" + fi if [ "$bus" == "scsi" ]; then - xml ed --inplace \ - -s '//devices/disk[last()]' -t elem -n address -v '' \ - -a '//devices/disk[last()]/address' -t attr -n controller -v '0' \ - -a '//devices/disk[last()]/address' -t attr -n type -v 'drive' \ - -a '//devices/disk[last()]/address' -t attr -n unit -v $sidx \ - "$xml" + xml ed --inplace \ + -s '//devices/disk[last()]' -t elem -n address -v '' \ + -a '//devices/disk[last()]/address' -t attr -n controller -v '0' \ + -a '//devices/disk[last()]/address' -t attr -n type -v 'drive' \ + -a '//devices/disk[last()]/address' -t attr -n unit -v $sidx \ + "$xml" fi if [ -n "${v[4]}" ]; then @@ -660,9 +690,15 @@ done for d in "${DISKS[@]}"; do IFS=':' read -ra disk <<< "$d" - disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.qcow2" - log qemu-img create -f qcow2 "$disk_path" ${disk[2]} - VOLUMES+=("disk-${disk[0]}-$OWNER:$disk_path:qcow2:${disk[1]}:${disk[0]}") + if [ -n "$SHARED" ]; then + disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.raw" + log qemu-img create -f raw "$disk_path" ${disk[2]} + VOLUMES+=("disk-${disk[0]}-$DISK_OWNER:$disk_path:raw:${disk[1]}:${disk[0]}") + else + disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.qcow2" + log qemu-img create -f qcow2 "$disk_path" ${disk[2]} + VOLUMES+=("disk-${disk[0]}-$OWNER:$disk_path:qcow2:${disk[1]}:${disk[0]}") + fi done notify "Discover hypervisor..." From 0240778f8eb5e3d5f4d7a137d6a9d919877910df Mon Sep 17 00:00:00 2001 From: Denis Valitov Date: Mon, 14 Sep 2020 09:02:00 +0000 Subject: [PATCH 2/2] Optimized time for creating and uploading discs for --shared mode --- run | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/run b/run index fc58d16..8a0d790 100755 --- a/run +++ b/run @@ -97,7 +97,7 @@ options: -c, --clean remove kernel and initramfs volumes after VM shutdown --shared using scsi disks as shared disk (The qcow2 - format is also replaced with raw.) Work if -f is enabled. + format is also replaced with raw.) -G, --gdb [HOST]:PORT Enable QEMU GDB stub via HOST:PORT -k, --kopt PARAM pass a kernel option -K, --keep don't shutdown VM immediately @@ -494,15 +494,17 @@ make_xml(){ } vm::vol::upload(){ - if ! logq virsh vol-info "$1" --pool "$POOL"; then - notify "Create volume $1 on $POOL" - local size=$(wc -c < "$2") - log virsh vol-create-as --format "$3" "$POOL" "$1" $size - fi - if cache::file::outdated "$2" "$HOST" "$POOL" "$1" || [ -n "$FORCE" ]; then - notify "Upload $2 to hypervisor" - log virsh vol-upload "$1" "$2" --pool "$POOL" - cache::file::update "$2" "$HOST" "$POOL" "$1" + if [ "$4" != "scsi" ] || [ -z "$NODE" ] || [ "$NODE" == "0" ] || [ -z "$SHARED" ]; then + if ! logq virsh vol-info "$1" --pool "$POOL"; then + notify "Create volume $1 on $POOL" + local size=$(wc -c < "$2") + log virsh vol-create-as --format "$3" "$POOL" "$1" $size + fi + if cache::file::outdated "$2" "$HOST" "$POOL" "$1" || [ -n "$FORCE" ]; then + notify "Upload $2 to hypervisor" + log virsh vol-upload "$1" "$2" --pool "$POOL" + cache::file::update "$2" "$HOST" "$POOL" "$1" + fi fi } @@ -691,13 +693,13 @@ done for d in "${DISKS[@]}"; do IFS=':' read -ra disk <<< "$d" if [ -n "$SHARED" ]; then - disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.raw" - log qemu-img create -f raw "$disk_path" ${disk[2]} - VOLUMES+=("disk-${disk[0]}-$DISK_OWNER:$disk_path:raw:${disk[1]}:${disk[0]}") + disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.raw" + log qemu-img create -f raw "$disk_path" ${disk[2]} + VOLUMES+=("disk-${disk[0]}-$DISK_OWNER:$disk_path:raw:${disk[1]}:${disk[0]}") else - disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.qcow2" - log qemu-img create -f qcow2 "$disk_path" ${disk[2]} - VOLUMES+=("disk-${disk[0]}-$OWNER:$disk_path:qcow2:${disk[1]}:${disk[0]}") + disk_path="$USR_CACHE_DIR/$VMNAME/disk-${disk[0]}.qcow" + log qemu-img create -f qcow2 "$disk_path" ${disk[2]} + VOLUMES+=("disk-${disk[0]}-$OWNER:$disk_path:qcow2:${disk[1]}:${disk[0]}") fi done @@ -739,6 +741,7 @@ if [ -n "$GDB_ADDRESS" ]; then xml::gdb::set "$XML_NAME" "$GDB_ADDRESS" fi +while [ -n "$NODE" ] && [ "$NODE" -ne "0" ] && ! [[ -f $USR_CACHE_DIR/ktest-0-$DISK_OWNER/start.log ]]; do sleep 1; done ktest::lock trap ktest::exit EXIT TAKEN_PORTS="$USR_CACHE_DIR/$VMNAME/port.list"