B #3244: Fix mixed-modes for shared/ssh (#3823)

src/tm_mad/shared/ln

@@ -38,8 +38,6 @@ fi
 
 . $TMCOMMON
 
-DRIVER_PATH=$(dirname $0)
-
 #-------------------------------------------------------------------------------
 # Set dst path and dir
 #-------------------------------------------------------------------------------
@@ -54,39 +52,10 @@ SRC_DS_PATH="$(dirname $(dirname $SRC_ARG_PATH))"
 
 SRC_PATH="${DST_DS_PATH}${SRC_ARG_PATH##$SRC_DS_PATH}"
 
-#-------------------------------------------------------------------------------
-# Get Image information
-#-------------------------------------------------------------------------------
-
-DISK_ID=$(basename ${DST_PATH} | cut -d. -f2)
-
-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 $VMID| $XPATH \
-                    /VM/HISTORY_RECORDS/HISTORY[last\(\)]/TM_MAD)
-
-TM_MAD="${XPATH_ELEMENTS[j++]}"
-
-if [ "$TM_MAD" = "ssh" ]; then
-    MONITOR="ssh"
-else
-    MONITOR=""
-fi
-
-#-------------------------------------------------------------------------------
-# Create DST path
-#-------------------------------------------------------------------------------
-
-ssh_make_path $DST_HOST $DST_DIR $MONITOR
-
 #-------------------------------------------------------------------------------
 # Link (ln) SRC into DST
 #-------------------------------------------------------------------------------
-log "Linking $SRC_PATH in $DST (in ${TM_MAD} mode)"
+log "Linking $SRC_PATH in $DST"
 
 LN_CMD=$(cat <<EOF
     set -ex -o pipefail
@@ -94,11 +63,7 @@ LN_CMD=$(cat <<EOF
     cd ${DST_DIR}
     rm -f ${DST_PATH}
 
-    if [ "${TM_MAD}" = 'ssh' ]; then
-        cp "${SRC_PATH}" "${DST_PATH}"
-    else
-        ln -s "${SRC_PATH}" "${DST_PATH}"
-    fi
+    ln -s "${SRC_PATH}" "${DST_PATH}"
 EOF
 )
 

src/tm_mad/shared/ln.ssh

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# ln fe:SOURCE host:remote_system_ds/disk.i vmid dsid
+#   - fe is the front-end hostname
+#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
+#   - host is the target host to deploy the VM
+#   - remote_system_ds is the path for the system datastore in the host
+#   - vmid is the id of the VM
+#   - dsid is the target datastore (0 is the system datastore)
+
+SRC=$1
+DST=$2
+
+VMID=$3
+DSID=$4
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+fi
+
+. $TMCOMMON
+
+#-------------------------------------------------------------------------------
+# Set dst path and dir
+#-------------------------------------------------------------------------------
+DST_PATH=`arg_path $DST`
+DST_HOST=`arg_host $DST`
+DST_DIR=`dirname $DST_PATH`
+
+SRC_ARG_PATH=`arg_path $SRC`
+
+DST_DS_PATH="$(dirname $(dirname $(dirname $DST_PATH)))"
+SRC_DS_PATH="$(dirname $(dirname $SRC_ARG_PATH))"
+
+SRC_PATH="${DST_DS_PATH}${SRC_ARG_PATH##$SRC_DS_PATH}"
+
+#-------------------------------------------------------------------------------
+# Create DST path
+#-------------------------------------------------------------------------------
+
+ssh_make_path $DST_HOST $DST_DIR 'ssh'
+
+#-------------------------------------------------------------------------------
+# Link (ln) SRC into DST
+#-------------------------------------------------------------------------------
+log "Linking $SRC_PATH in $DST (in ssh mode)"
+
+LN_CMD=$(cat <<EOF
+    set -ex -o pipefail
+
+    cd ${DST_DIR}
+    rm -f ${DST_PATH}
+
+    cp "${SRC_PATH}" "${DST_PATH}"
+EOF
+)
+
+ssh_exec_and_log "${DST_HOST}" \
+    "${LN_CMD}" \
+    "Error linking ${SRC} to ${DST}"
+
+exit 0

src/tm_mad/shared/mvds.ssh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# mvds host:remote_system_ds/disk.i fe:SOURCE vmid dsid
+#   - fe is the front-end hostname
+#   - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk
+#   - host is the target host to deploy the VM
+#   - remote_system_ds is the path for the system datastore in the host
+#   - vmid is the id of the VM
+#   - dsid is the target datastore (0 is the system datastore)
+
+SRC=$1
+DST=$2
+
+VMID=$3
+DSID=$4
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+fi
+
+. $TMCOMMON
+
+#-------------------------------------------------------------------------------
+# Set dst path and dir
+#-------------------------------------------------------------------------------
+
+SRC_PATH="$(arg_path $SRC)"
+SRC_HOST="$(arg_host $SRC)"
+
+DST_PATH="$(arg_path $DST)"
+
+#-------------------------------------------------------------------------------
+# Move the image back to the datastore
+#-------------------------------------------------------------------------------
+
+log "Moving $SRC to datastore as $DST"
+
+ssh_exec_and_log "${SRC_HOST}" \
+    "cp -r ${SRC_PATH} ${DST_PATH}" \
+    "Error copying ${SRC} to ${DST}" >&2