F #1112: Fix disk-saveas for ceph and lvm (#848)

Co-authored-by: Jan Orel <jorel@opennebula.systems>

src/tm/TransferManager.cc

@@ -1842,6 +1842,7 @@ void TransferManager::trigger_saveas_hot(int vid)
         string ds_id;
         string tsys;
         string tm_mad_system;
+        string hostname;
 
         ostringstream os;
 
@@ -1899,10 +1900,20 @@ void TransferManager::trigger_saveas_hot(int vid)
             }
         }
 
+        if (vm->get_lcm_state() == VirtualMachine::HOTPLUG_SAVEAS_STOPPED ||
+            vm->get_lcm_state() == VirtualMachine::HOTPLUG_SAVEAS_UNDEPLOYED)
+        {
+            hostname = nd.get_nebula_hostname();
+        }
+        else
+        {
+            hostname = vm->get_hostname();
+        }
+
         //CPDS tm_mad hostname:remote_system_dir/disk.0 source snapid vmid dsid
         xfr << "CPDS" << tm_mad_system
             << " " << tm_mad << " "
-            << vm->get_hostname() << ":"
+            << hostname << ":"
             << vm->get_system_dir() << "/disk." << disk_id << " "
             << src << " "
             << snap_id << " "

src/tm_mad/ceph/cpds

@@ -42,6 +42,7 @@ fi
 DRIVER_PATH=$(dirname $0)
 
 source $TMCOMMON
+source ${DRIVER_PATH}/../../datastore/libfs.sh
 source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 source ${DRIVER_PATH}/../../etc/vmm/kvm/kvmrc
 
@@ -71,13 +72,15 @@ done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
+                    /VM/LCM_STATE)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
 CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
+LCM_STATE="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Get Datastore information
@@ -88,9 +91,11 @@ unset i j XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
         XPATH_ELEMENTS[i++]="$element"
 done < <(onedatastore show -x $DS_ID | $XPATH \
-                    /DATASTORE/TEMPLATE/EC_POOL_NAME)
+                    /DATASTORE/TEMPLATE/EC_POOL_NAME \
+                    /DATASTORE/TEMPLATE/BRIDGE_LIST)
 
 EC_POOL_NAME="${XPATH_ELEMENTS[j++]}"
+BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Copy Image back to the datastore
@@ -118,6 +123,14 @@ if [ -n "$EC_POOL_NAME" ]; then
     EC_POOL_OPT="--data-pool ${EC_POOL_NAME}"
 fi
 
+# Undeployed VM state, do not use front-end, choose host from bridge_list
+if [ "$LCM_STATE" = '67' ] || [ "$LCM_STATE" = '68' ]; then
+    if [ -n "$BRIDGE_LIST" ]; then
+        SRC_HOST=`get_destination_host`
+    fi
+fi
+
+
 COPY_CMD=$(cat <<EOF
     RBD="${RBD}"
 

src/tm_mad/fs_lvm/cpds

@@ -57,14 +57,51 @@ VG_NAME="vg-one-$DS_SYS_ID"
 
 DEV="/dev/${VG_NAME}/${LV_NAME}"
 
-DUMP_CMD=$(cat <<EOF
-    $DD if=$DEV of=$DST_PATH bs=${DD_BLOCK_SIZE:-64k}
-EOF
-)
+#-------------------------------------------------------------------------------
+# Get VM information
+#-------------------------------------------------------------------------------
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <(onevm show -x $VM_ID| $XPATH \
+                    '/VM/LCM_STATE' \
+                    '/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME')
+
+LCM_STATE="${XPATH_ELEMENTS[j++]}"
+LAST_HOST="${XPATH_ELEMENTS[j++]}"
+
+# Undeployed VM state
+if [ "$LCM_STATE" = '67' ] || [ "$LCM_STATE" = '68' ]; then
+
+    # get BRIDGE_LIST from datastore
+    IFS= read -r -d '' BRIDGE_LIST < <(onedatastore show -x $DS_SYS_ID \
+        | $XPATH /DATASTORE/TEMPLATE/BRIDGE_LIST )
+
+    if [ -n "$BRIDGE_LIST" ]; then
+        SRC_HOST=$(get_destination_host)
+    elif [ -n "$LAST_HOST" ]; then
+        SRC_HOST=$LAST_HOST
+    else
+        log_error "Unknown last VM host nor BRIDGE_LIST"
+        exit -1
+    fi
+    ACTIVATE="$SUDO $LVCHANGE -ay "$DEV""
+    DEACTIVATE="$SUDO $LVCHANGE -an "$DEV""
+fi
 
 #-------------------------------------------------------------------------------
 # Move the image back to the datastore
 #-------------------------------------------------------------------------------
+DUMP_CMD=$(cat <<EOF
+    $ACTIVATE
+    $DD if=$DEV of=$DST_PATH bs=${DD_BLOCK_SIZE:-64k}
+    $DEACTIVATE
+EOF
+)
+
 log "Dumping $SRC to $DST"
 
 ssh_exec_and_log "$SRC_HOST" "$DUMP_CMD" \