From ded6ff9dbe0303b3d041050e588dc09f0b4be170 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 28 Oct 2015 16:35:43 +0100 Subject: [PATCH] Feature #3987: Add TM actions: mv, postmigrate and premigrate --- src/tm_mad/ceph/mv | 20 +---------- src/tm_mad/ceph/postmigrate | 59 +++++++++++++++++++++++++++++- src/tm_mad/ceph/premigrate | 72 ++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 21 deletions(-) mode change 100755 => 120000 src/tm_mad/ceph/mv mode change 120000 => 100755 src/tm_mad/ceph/postmigrate mode change 120000 => 100755 src/tm_mad/ceph/premigrate diff --git a/src/tm_mad/ceph/mv b/src/tm_mad/ceph/mv deleted file mode 100755 index c84327754a..0000000000 --- a/src/tm_mad/ceph/mv +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# -------------------------------------------------------------------------- # -# Copyright 2002-2015, 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. # -#--------------------------------------------------------------------------- # - -exit 0 diff --git a/src/tm_mad/ceph/mv b/src/tm_mad/ceph/mv new file mode 120000 index 0000000000..b940b651ae --- /dev/null +++ b/src/tm_mad/ceph/mv @@ -0,0 +1 @@ +../ssh/mv \ No newline at end of file diff --git a/src/tm_mad/ceph/postmigrate b/src/tm_mad/ceph/postmigrate deleted file mode 120000 index d580dd8260..0000000000 --- a/src/tm_mad/ceph/postmigrate +++ /dev/null @@ -1 +0,0 @@ -../common/postmigrate \ No newline at end of file diff --git a/src/tm_mad/ceph/postmigrate b/src/tm_mad/ceph/postmigrate new file mode 100755 index 0000000000..c47bd50f9c --- /dev/null +++ b/src/tm_mad/ceph/postmigrate @@ -0,0 +1,58 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2015, 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. # +#--------------------------------------------------------------------------- # + +# PREMIGRATE SOURCE DST remote_system_dir vmid dsid template +# - SOURCE is the host where the VM is running +# - DST is the host where the VM is to be migrated +# - remote_system_dir is the path for the VM home in the system datastore +# - vmid is the id of the VM +# - dsid is the target datastore +# - template is the template of the VM in XML and base64 encoded + +SRC_HOST=$1 +DST_HOST=$2 + +DST_PATH=$3 + +VMID=$4 +DSID=$5 + +TEMPLATE_64=$6 + +#-------------------------------------------------------------------------------- + +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 + +source $TMCOMMON + +#-------------------------------------------------------------------------------- + +if [ "$SRC_HOST" == "$DST_HOST" ]; then + log "Not moving $SRC_HOST to $DST_HOST, they are the same host" + exit 0 +fi + +#-------------------------------------------------------------------------------- + +exec_and_log "$SSH $SRC_HOST rm -rf $DST_PATH" + +exit 0 diff --git a/src/tm_mad/ceph/premigrate b/src/tm_mad/ceph/premigrate deleted file mode 120000 index 0e108a8a26..0000000000 --- a/src/tm_mad/ceph/premigrate +++ /dev/null @@ -1 +0,0 @@ -../common/premigrate \ No newline at end of file diff --git a/src/tm_mad/ceph/premigrate b/src/tm_mad/ceph/premigrate new file mode 100755 index 0000000000..dd12f377c5 --- /dev/null +++ b/src/tm_mad/ceph/premigrate @@ -0,0 +1,71 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2015, 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. # +#--------------------------------------------------------------------------- # + +# PREMIGRATE SOURCE DST remote_system_dir vmid dsid template +# - SOURCE is the host where the VM is running +# - DST is the host where the VM is to be migrated +# - remote_system_dir is the path for the VM home in the system datastore +# - vmid is the id of the VM +# - dsid is the target datastore +# - template is the template of the VM in XML and base64 encoded + +SRC_HOST=$1 +DST_HOST=$2 + +DST_PATH=$3 + +VMID=$4 +DSID=$5 + +TEMPLATE_64=$6 + +#-------------------------------------------------------------------------------- + +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 + +source $TMCOMMON + +#-------------------------------------------------------------------------------- + +if [ "$SRC_HOST" == "$DST_HOST" ]; then + log "Not moving $SRC_HOST to $DST_HOST, they are the same host" + exit 0 +fi + +#-------------------------------------------------------------------------------- + +DST_PATH_DIRNAME=`dirname $DST_PATH` +DST_PATH_BASENAME=`basename $DST_PATH` + +ssh_make_path "$DST_HOST" "$DST_PATH" + +log "Moving $SRC_HOST:$DST_PATH to $DST_HOST:$DST_PATH" + +ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \ + "Error removing target path to prevent overwrite errors" + +TAR_COPY="$SSH $SRC_HOST '$TAR -C $DST_PATH_DIRNAME --sparse -cf - $DST_PATH_BASENAME'" +TAR_COPY="$TAR_COPY | $SSH $DST_HOST '$TAR -C $DST_PATH_DIRNAME --sparse -xf -'" + +exec_and_log "eval $TAR_COPY" "Error copying disk directory to target host" + +exit 0