From 7fdb46a650555bc58e57f30803d5d95d09c148b4 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 18 Jan 2022 11:09:10 +0100
Subject: [PATCH] b #5699: Skip deactivation on FT states fs_lvm_ssh

---
 src/tm_mad/fs_lvm_ssh/mv | 5 +++--
 src/tm_mad/ssh/mv        | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/tm_mad/fs_lvm_ssh/mv b/src/tm_mad/fs_lvm_ssh/mv
index 56a56ce8e8..42ed6ee866 100755
--- a/src/tm_mad/fs_lvm_ssh/mv
+++ b/src/tm_mad/fs_lvm_ssh/mv
@@ -79,9 +79,10 @@ if [ "$(is_disk "$SRC_PATH")" -eq 1 ]; then
     DST_DEV="/dev/${DST_VG_NAME}/${LV_NAME}"
 
     # skip deactivate for `onevm resume` (after stop or undeploy)
-    # 9(49) = PROLOG_RESUME(+FAILURE)
+    # 9(49)  = PROLOG_RESUME(+FAILURE)
     # 31(50) = PROLOG_UNDEPLOY(+FAILURE)
-    if ! [[ "$LCM_STATE" =~ ^(9|31|49|50)$ ]]; then
+    # 60(61) = PROLOG_MIGRATE_UNKNOWN(+FAILURE)
+    if ! [[ "$LCM_STATE" =~ ^(9|31|49|50|60|61)$ ]]; then
         # deactivate
         CMD=$(cat <<EOF
             set -ex -o pipefail
diff --git a/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv
index 17451f5ab0..d21247a80d 100755
--- a/src/tm_mad/ssh/mv
+++ b/src/tm_mad/ssh/mv
@@ -26,6 +26,9 @@
 SRC=$1
 DST=$2
 
+VMID=$3
+DSID=$4
+
 if [ -z "${ONE_LOCATION}" ]; then
     TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
 else
@@ -57,7 +60,11 @@ if [ "$(is_disk $DST_PATH)" -eq 1 ]; then
     exit 0
 fi
 
-if [ "$(lcm_state)" -eq 60 ]; then
+#Do not try to move any files in PROLOG_MIGRATE_UNKNOWN (60) or
+#PROLOG_MIGRATE_UNKNOWN_FAILURE (61)
+LCM_STATE=$(lcm_state "$VMID")
+
+if ! [[ "$LCM_STATE" =~ ^(60|61)$ ]]; then
     log "Not moving files from $SRC_HOST in FT mode"
     exit 0
 fi