From 086668dbfc393218f688c492d2fff5a9dd83af44 Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Sat, 17 Sep 2016 15:35:22 +0300 Subject: [PATCH 1/4] tm/fs_lvm: implement failmigrate When the live-migration fails the failmigrate script should deactivate the disks on the destination host --- src/tm_mad/fs_lvm/failmigrate | 64 ++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) mode change 120000 => 100755 src/tm_mad/fs_lvm/failmigrate diff --git a/src/tm_mad/fs_lvm/failmigrate b/src/tm_mad/fs_lvm/failmigrate deleted file mode 120000 index 5928a427940..00000000000 --- a/src/tm_mad/fs_lvm/failmigrate +++ /dev/null @@ -1 +0,0 @@ -../common/failmigrate \ No newline at end of file diff --git a/src/tm_mad/fs_lvm/failmigrate b/src/tm_mad/fs_lvm/failmigrate new file mode 100755 index 00000000000..e98233f5153 --- /dev/null +++ b/src/tm_mad/fs_lvm/failmigrate @@ -0,0 +1,63 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2016, 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. # +#--------------------------------------------------------------------------- # + +# POSTMIGRATE 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 + +. $TMCOMMON + +CMD=$(cat < Date: Sat, 17 Sep 2016 15:57:57 +0300 Subject: [PATCH 2/4] tm/ceph/failmigrate do migrate_oter then clean up DST_HOST --- src/tm_mad/ceph/failmigrate | 62 ++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) mode change 120000 => 100755 src/tm_mad/ceph/failmigrate diff --git a/src/tm_mad/ceph/failmigrate b/src/tm_mad/ceph/failmigrate deleted file mode 120000 index 5928a427940..00000000000 --- a/src/tm_mad/ceph/failmigrate +++ /dev/null @@ -1 +0,0 @@ -../common/failmigrate \ No newline at end of file diff --git a/src/tm_mad/ceph/failmigrate b/src/tm_mad/ceph/failmigrate new file mode 100755 index 00000000000..e423c675d9f --- /dev/null +++ b/src/tm_mad/ceph/failmigrate @@ -0,0 +1,61 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2016, 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. # +#--------------------------------------------------------------------------- # + +# FAILMIGRATE 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 + +#-------------------------------------------------------------------------------- + +migrate_other "$@" + +ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \ + "Error removing target path to prevent overwrite errors" + +exit 0 From b45b07e16325c839ebffdff4069840595422abd1 Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Sat, 17 Sep 2016 15:59:57 +0300 Subject: [PATCH 3/4] tm/{qcow2,shared,ssh}/failmigrate do migrate_other() --- src/tm_mad/qcow2/failmigrate | 2 +- src/tm_mad/shared/failmigrate | 2 +- src/tm_mad/ssh/failmigrate | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tm_mad/qcow2/failmigrate b/src/tm_mad/qcow2/failmigrate index 5928a427940..ae93fad8746 120000 --- a/src/tm_mad/qcow2/failmigrate +++ b/src/tm_mad/qcow2/failmigrate @@ -1 +1 @@ -../common/failmigrate \ No newline at end of file +../common/prepostmigrate \ No newline at end of file diff --git a/src/tm_mad/shared/failmigrate b/src/tm_mad/shared/failmigrate index 5928a427940..ae93fad8746 120000 --- a/src/tm_mad/shared/failmigrate +++ b/src/tm_mad/shared/failmigrate @@ -1 +1 @@ -../common/failmigrate \ No newline at end of file +../common/prepostmigrate \ No newline at end of file diff --git a/src/tm_mad/ssh/failmigrate b/src/tm_mad/ssh/failmigrate index 5928a427940..ae93fad8746 120000 --- a/src/tm_mad/ssh/failmigrate +++ b/src/tm_mad/ssh/failmigrate @@ -1 +1 @@ -../common/failmigrate \ No newline at end of file +../common/prepostmigrate \ No newline at end of file From 46044462eb9f40033d40ef385174944739e640c0 Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Tue, 10 Jan 2017 22:43:39 +0200 Subject: [PATCH 4/4] tm_mad/ceph/failmigrate add the fix from Bug #4969 used code from OpenNebula/one#182 - do not remove the DST_PATH on the DST_HOST if the datastore template has `SHARED=YES` --- src/tm_mad/ceph/failmigrate | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/tm_mad/ceph/failmigrate b/src/tm_mad/ceph/failmigrate index e423c675d9f..468f018623c 100755 --- a/src/tm_mad/ceph/failmigrate +++ b/src/tm_mad/ceph/failmigrate @@ -55,6 +55,27 @@ fi migrate_other "$@" +#-------------------------------------------------------------------------------- + +# Get custom datastore values +DRIVER_PATH=$(dirname "$0") +XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" + +unset XPATH_ELEMENTS i j + +while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" +done < <(onedatastore show -x "$DSID" | $XPATH \ + /DATASTORE/TEMPLATE/SHARED) + +SHARED="${XPATH_ELEMENTS[j++]}" + +if [ "$SHARED" = "YES" ]; then + exit 0 +fi + +#-------------------------------------------------------------------------------- + ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \ "Error removing target path to prevent overwrite errors"