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

Feature #3782: qcow2/ln is no longer a symlink to shared/ln

Browse Source
This commit is contained in:
Jaime Melis 2015-08-11 13:15:16 +02:00
parent b200e9f938
commit 7e7e30cbc8
2 changed files with 88 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tm_mad/qcow2/ln
View File

@ -1 +0,0 @@
../shared/ln

85
src/tm_mad/qcow2/ln Executable file
View File

@ -0,0 +1,85 @@
#!/bin/bash
# -------------------------------------------------------------------------- #
# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs #
# #
# 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}"
SNAP_DIR="${SRC_PATH}.snap"
#-------------------------------------------------------------------------------
# Create DST path
#-------------------------------------------------------------------------------
ssh_make_path $DST_HOST $DST_DIR
#-------------------------------------------------------------------------------
# Link (ln) SRC into DST
#-------------------------------------------------------------------------------
log "Linking $SRC_PATH in $DST"
CMD=$(cat <<EOT
set -ex
mkdir -p "${SNAP_DIR}"
SNAP="\$(ls ${SNAP_DIR} | sort -n | tail -n 1)"
if [ -z "\${SNAP}" ]; then
SNAP=0
ln -sf "$SRC_PATH" "$SNAP_DIR/0"
fi
ln -sf "$SNAP_DIR/\$SNAP" "$DST_PATH"
EOT
)
ssh_exec_and_log $DST_HOST "$CMD" "Error linking $SRC to $DST"
exit 0

21
src/tm_mad/shared/ln
View File

@ -52,7 +52,6 @@ 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}"
SNAP_DIR="${SRC_PATH}.snap"
#-------------------------------------------------------------------------------
# Create DST path
@ -64,22 +63,8 @@ ssh_make_path $DST_HOST $DST_DIR
#-------------------------------------------------------------------------------
log "Linking $SRC_PATH in $DST"
CMD=$(cat <<EOT
set -ex
mkdir -p "${SNAP_DIR}"
SNAP="\$(ls ${SNAP_DIR} | sort -n | tail -n 1)"
if [ -z "\${SNAP}" ]; then
SNAP=0
ln -sf "$SRC_PATH" "$SNAP_DIR/0"
fi
ln -sf "$SNAP_DIR/\$SNAP" "$DST_PATH"
EOT
)
ssh_exec_and_log $DST_HOST "$CMD" "Error linking $SRC to $DST"
ssh_exec_and_log $DST_HOST \
"cd $DST_DIR; rm -f $DST_PATH ; ln -s $SRC_PATH $DST_PATH" \
"Error linking $SRC to $DST"
exit 0