From a6274f58ccbcc8f558d63b24eb9af970ed8604a9 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Sat, 14 Sep 2024 02:46:48 +0300
Subject: [PATCH] Same fix for save/restore: they also need to ssh to target
 node

---
 opennebula/remotes/vmm/kvm/restore.vitastor |  9 +++++----
 opennebula/remotes/vmm/kvm/save.vitastor    | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/opennebula/remotes/vmm/kvm/restore.vitastor b/opennebula/remotes/vmm/kvm/restore.vitastor
index 07d4a00a..ef9dac5b 100755
--- a/opennebula/remotes/vmm/kvm/restore.vitastor
+++ b/opennebula/remotes/vmm/kvm/restore.vitastor
@@ -10,7 +10,7 @@ source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
 source $DRIVER_PATH/../../scripts_common.sh
 
 FILE=$1
-HOST=$2
+DST_HOST=$2
 DEPLOY_ID=$3
 VM_ID=$4
 DS_ID=$5
@@ -33,7 +33,8 @@ fi
 
 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"
-exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"
+ssh_exec_and_log "$DST_HOST" "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
+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' $@"
diff --git a/opennebula/remotes/vmm/kvm/save.vitastor b/opennebula/remotes/vmm/kvm/save.vitastor
index 981dc31c..dc01f6bb 100755
--- a/opennebula/remotes/vmm/kvm/save.vitastor
+++ b/opennebula/remotes/vmm/kvm/save.vitastor
@@ -11,11 +11,14 @@ source $DRIVER_PATH/../../scripts_common.sh
 
 DEPLOY_ID=$1
 FILE=$2
+SRC_HOST=$3
 VM_ID=$4
 DS_ID=$5
 
-rm -f "$FILE"
-"$DRIVER_PATH"/save $@
+set -e
+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"
 
@@ -42,7 +45,7 @@ fi
 
 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"
-exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)"
+ssh_exec_and_log "$SRC_HOST" "$CLI dd if=$FILE oimg=$DST_IMAGE conv=trunc" "Error importing checkpoint into $DST_IMAGE"
+ssh_exec_and_log "$SRC_HOST" "$RM -f $FILE" "Error removing checkpoint ($FILE)"
 
 exit 0