From 24112c3338c0bc96c5e70e679e79f579baea3795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.io>
Date: Fri, 22 Jul 2022 09:35:45 +0200
Subject: [PATCH] B #5923: Fix DS migration for fs_lvm* (#2246)

(cherry picked from commit 47cb7b891ee41e4af0c3ad713770b03c18de2bb3)
---
 src/tm_mad/fs_lvm/mv     | 39 ++++++++++++++++++++++++++-------------
 src/tm_mad/fs_lvm_ssh/mv | 39 +++++++++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/src/tm_mad/fs_lvm/mv b/src/tm_mad/fs_lvm/mv
index 82fb827a15..e2e4045882 100755
--- a/src/tm_mad/fs_lvm/mv
+++ b/src/tm_mad/fs_lvm/mv
@@ -122,11 +122,23 @@ EOF
 )
 
         LOCK="tm-fs_lvm-${DST_DS_SYS_ID}.lock"
-        exclusive "${LOCK}" 120 ssh_exec_and_log "${SRC_HOST}" "${CREATE_CMD}" \
+        exclusive "${LOCK}" 120 ssh_exec_and_log "${DST_HOST}" "${CREATE_CMD}" \
                 "Error creating LV named ${LV_NAME}"
 
+        # activate src volume (on DST)
+        CMD=$(cat <<EOF
+            set -ex -o pipefail
+            ${SYNC}
+            ${SUDO} ${LVSCAN}
+            ${SUDO} ${LVCHANGE} -ay "${SRC_DEV}"
+EOF
+)
+        LOCK="tm-fs_lvm-${SRC_DS_SYS_ID}.lock"
+        exclusive "${LOCK}" 120 ssh_exec_and_log "${DST_HOST}" "${CMD}" \
+            "Error deactivating disk ${SRC_PATH}"
+
         # copy volume data
-        ssh_exec_and_log "$SRC_HOST" \
+        ssh_exec_and_log "$DST_HOST" \
             "${DD} if=${SRC_DEV} of=${DST_DEV} bs=${DD_BLOCK_SIZE:-64k}" \
             "Error copying ${SRC} to ${DST}"
 
@@ -144,20 +156,21 @@ EOF
         LOCK="tm-fs_lvm-${SRC_DS_SYS_ID}.lock"
         exclusive "${LOCK}" 120 ssh_exec_and_log "${SRC_HOST}" "${DELETE_CMD}" \
             "Error deleting old LV ${SRC_DEV}"
-    fi
+    else
+        # activate
+        CMD=$(cat <<EOF
+            set -ex -o pipefail
+            ${SYNC}
+            ${SUDO} ${LVSCAN}
+            ${SUDO} ${LVCHANGE} -ay "${DST_DEV}"
 
-    # activate
-    CMD=$(cat <<EOF
-        set -ex -o pipefail
-        ${SYNC}
-        ${SUDO} ${LVSCAN}
-        ${SUDO} ${LVCHANGE} -ay "${DST_DEV}"
-
-        hostname -f >"${DST_DIR}/.host" || :
+            hostname -f >"${DST_DIR}/.host" || :
 EOF
 )
-    ssh_exec_and_log "$DST_HOST" "$CMD" \
-        "Error activating disk $DST_PATH"
+        ssh_exec_and_log "$DST_HOST" "$CMD" \
+            "Error activating disk $DST_PATH"
+
+    fi
 
     exit 0
 fi
diff --git a/src/tm_mad/fs_lvm_ssh/mv b/src/tm_mad/fs_lvm_ssh/mv
index 70c8ced92c..9956b46202 100755
--- a/src/tm_mad/fs_lvm_ssh/mv
+++ b/src/tm_mad/fs_lvm_ssh/mv
@@ -122,11 +122,23 @@ EOF
 )
 
         LOCK="tm-fs_lvm-${DST_DS_SYS_ID}.lock"
-        exclusive "${LOCK}" 120 ssh_exec_and_log "${SRC_HOST}" "${CREATE_CMD}" \
+        exclusive "${LOCK}" 120 ssh_exec_and_log "${DST_HOST}" "${CREATE_CMD}" \
                 "Error creating LV named ${LV_NAME}"
 
+        # activate src volume (on DST)
+        CMD=$(cat <<EOF
+            set -ex -o pipefail
+            ${SYNC}
+            ${SUDO} ${LVSCAN}
+            ${SUDO} ${LVCHANGE} -ay "${SRC_DEV}"
+EOF
+)
+        LOCK="tm-fs_lvm-${SRC_DS_SYS_ID}.lock"
+        exclusive "${LOCK}" 120 ssh_exec_and_log "${DST_HOST}" "${CMD}" \
+            "Error deactivating disk ${SRC_PATH}"
+
         # copy volume data
-        ssh_exec_and_log "$SRC_HOST" \
+        ssh_exec_and_log "$DST_HOST" \
             "${DD} if=${SRC_DEV} of=${DST_DEV} bs=${DD_BLOCK_SIZE:-64k}" \
             "Error copying ${SRC} to ${DST}"
 
@@ -144,21 +156,20 @@ EOF
         LOCK="tm-fs_lvm-${SRC_DS_SYS_ID}.lock"
         exclusive "${LOCK}" 120 ssh_exec_and_log "${SRC_HOST}" "${DELETE_CMD}" \
             "Error deleting old LV ${SRC_DEV}"
-    fi
+    else
+        # activate
+        CMD=$(cat <<EOF
+            set -ex -o pipefail
+            ${SYNC}
+            ${SUDO} ${LVSCAN}
+            ${SUDO} ${LVCHANGE} -ay "${DST_DEV}"
 
-    # activate
-    CMD=$(cat <<EOF
-        set -ex -o pipefail
-        ${SYNC}
-        ${SUDO} ${LVSCAN}
-        ${SUDO} ${LVCHANGE} -ay "${DST_DEV}"
-
-        hostname -f >"${DST_DIR}/.host" || :
+            hostname -f >"${DST_DIR}/.host" || :
 EOF
 )
-    ssh_exec_and_log "$DST_HOST" "$CMD" \
-        "Error activating disk $DST_PATH"
-
+        ssh_exec_and_log "$DST_HOST" "$CMD" \
+            "Error activating disk $DST_PATH"
+    fi
 fi
 
 # After managing LV de/activation on different hosts, transfer normal files