thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Same fix for save/restore: they also need to ssh to target node

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-09-14 02:46:48 +03:00
parent ac29ffea6a
commit a6274f58cc
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opennebula/remotes/vmm/kvm/restore.vitastor
+5 -4
View File
@@ -10,7 +10,7 @@ source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
source $DRIVER_PATH/../../scripts_common.sh source $DRIVER_PATH/../../scripts_common.sh
FILE=$1 FILE=$1
HOST=$2 DST_HOST=$2
DEPLOY_ID=$3 DEPLOY_ID=$3
VM_ID=$4 VM_ID=$4
DS_ID=$5 DS_ID=$5
@@ -33,7 +33,8 @@ fi
SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint" SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
exec_and_log "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE" ssh_exec_and_log "$DST_HOST" "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE" ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"
"$DRIVER_PATH"/restore $@ set -e
ssh "$DST_HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/restore' $@"
opennebula/remotes/vmm/kvm/save.vitastor
+7 -4
View File
@@ -11,11 +11,14 @@ source $DRIVER_PATH/../../scripts_common.sh
DEPLOY_ID=$1 DEPLOY_ID=$1
FILE=$2 FILE=$2
SRC_HOST=$3
VM_ID=$4 VM_ID=$4
DS_ID=$5 DS_ID=$5
rm -f "$FILE" set -e
"$DRIVER_PATH"/save $@ ssh "$SRC_HOST" 'rm -f "$FILE"'
ssh "$SRC_HOST" "'${SCRIPTS_REMOTE_DIR:-/var/tmp/one}/vmm/kvm/save' $@"
set +e
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
@@ -42,7 +45,7 @@ fi
DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint" DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
exec_and_log "$CLI dd if=$FILE oimg=$DST_IMAGE conv=trunc" "Error importing checkpoint into $DST_IMAGE" ssh_exec_and_log "$SRC_HOST" "$CLI dd if=$FILE oimg=$DST_IMAGE conv=trunc" "Error importing checkpoint into $DST_IMAGE"
exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)" ssh_exec_and_log "$SRC_HOST" "$RM -f $FILE" "Error removing checkpoint ($FILE)"
exit 0 exit 0