shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B #-: Fix replica migration

Browse Source 
6.8 uses full disk paths in domain definitions for KVM. This commits
fixes some issues to adapt the migrate script in this case.
This commit is contained in:
Ruben S. Montero 2023-11-16 11:14:45 +01:00
parent 9b9f7196bf
commit 372a3be710
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vmm_mad/remotes/kvm/migrate
View File

@ -41,7 +41,7 @@ get_size_and_format_of_disk_img() {
local QEMU_IMG_PATH="$1"
local PARAM="$2"
if [[ "$TARGET" =~ disk.[0-9]*.snap/ ]]; then
if [[ "$QEMU_IMG_PATH" =~ disk.[0-9]*.snap/ ]]; then
#Disk lives in snap dir it is a link (includes replica)
echo unknown qcow2-symlink
return
@ -165,16 +165,22 @@ else
fi
# copy disk snapshots
if [ -d "${DISK_PATH}.snap" ] || [ -L "${DISK_PATH}.snap" ]; then
multiline_exec_and_log "$TAR -cSf - $DISK_PATH.snap | $SSH $DEST_HOST '$TAR -xSf - -C / '" \
"Failed to rsync disk snapshot ${DISK_PATH}.snap to $DEST_HOST"
if [[ "$DISK_PATH" =~ (disk\.[0-9]*\.snap)/. ]]; then
SNAP_DIR="$VM_DIR/${BASH_REMATCH[1]}"
elif [ -d "${DISK_PATH}.snap" ]; then #it should be included in the clause above
SNAP_DIR="${DISK_PATH}.snap"
fi
if [ -n "${SNAP_DIR}" ]; then
multiline_exec_and_log "$TAR -cSf - ${SNAP_DIR} | $SSH $DEST_HOST '$TAR -xSf - -C / '" \
"Failed to rsync disk snapshot ${SNAP_DIR} to $DEST_HOST"
fi
# recreate symlinks
if [ -L "$DISK_PATH" ]; then
TARGET=$(readlink $DISK_PATH)
LNAME=$DISK_PATH
elif [[ "$DISK_PATH" =~ (disk.([0-9]*).snap/[0-9]*) ]]; then
elif [[ "$DISK_PATH" =~ (disk\.([0-9]*)\.snap/.*) ]]; then
TARGET=${BASH_REMATCH[1]}
LNAME="disk.${BASH_REMATCH[2]}"
else