From 7f49e1c16dc5dfd6cecdf6be3d30a820a17262b0 Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Thu, 26 Oct 2023 02:56:14 -0600 Subject: [PATCH] F OpenNebula/one#6363: Handle system snapshots after poweroff (#2790) (cherry picked from commit 313391b651329d51c3449292fe51ffecaa3ad2ad) --- src/vmm_mad/remotes/kvm/migrate | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate index c45c21b36f..4b1890d7a9 100755 --- a/src/vmm_mad/remotes/kvm/migrate +++ b/src/vmm_mad/remotes/kvm/migrate @@ -254,7 +254,7 @@ if [ $RC -ne 0 ]; then fi # redefine potential snapshots after live migration -if [ "$SHARED" = "YES" ] && [ -n "$SNAP_CUR" ]; then +if [ "$SHARED" = "YES" ]; then UUID=$(virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system dominfo $DEPLOY_ID | awk '/UUID:/ {print $2}') DISK_PATH=$(virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system domblklist $DEPLOY_ID | awk '/disk.0/ {print $2}') DISK_DIR=$(dirname $DISK_PATH) @@ -270,7 +270,8 @@ if [ "$SHARED" = "YES" ] && [ -n "$SNAP_CUR" ]; then # redefine the snapshot using the xml metadata file virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system snapshot-create $DEPLOY_ID $SNAPSHOT_MD_XML --redefine > /dev/null || true done - virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system snapshot-current $DEPLOY_ID $SNAP_CUR + + [ -n "$SNAP_CUR" ] && virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system snapshot-current $DEPLOY_ID $SNAP_CUR fi # Synchronize VM time on background on remote host