B #6363: 64 patch

OpenNebula · Oct 24, 2023 · 2cb4c09 · 2cb4c09
1 parent 534d2eb
commit 2cb4c09
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate
@@ -248,20 +248,19 @@ if [ $RC -ne 0 ]; then
 fi
 
 # redefine potential snapshots after live migration
-if [ "$SHARED" = "YES" ] && [ -n "$SNAP_CUR" ]; 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)
+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)
 
-    for SNAPSHOT_MD_XML in $(ls ${DISK_DIR}/snap-*.xml 2>/dev/null); do
-        # replace uuid in the snapshot metadata xml
-        sed -i "s%<uuid>[[:alnum:]-]*</uuid>%<uuid>$UUID</uuid>%" $SNAPSHOT_MD_XML
+for SNAPSHOT_MD_XML in $(ls -v ${DISK_DIR}/snap-*.xml 2>/dev/null); do
+    # replace uuid in the snapshot metadata xml
+    sed -i "s%<uuid>[[:alnum:]-]*</uuid>%<uuid>$UUID</uuid>%" $SNAPSHOT_MD_XML
 
-        # 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
-fi
+    # 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
+
+[ -n "$SNAP_CUR" ] && virsh --connect $QEMU_PROTOCOL://$DEST_HOST/system snapshot-current $DEPLOY_ID $SNAP_CUR
 
 # Synchronize VM time on background on remote host
 if [ "$SYNC_TIME" = "yes" ]; then