From c0d0f17d9779486d6f9db145be429339276212b2 Mon Sep 17 00:00:00 2001
From: Jan Orel <jorel@opennebula.systems>
Date: Thu, 30 Jul 2020 11:06:03 +0200
Subject: [PATCH] M #3460: Move same dir check below ssh_make_path (#131)

(cherry picked from commit 45e0126b87470ee7a0686e1b74e84be3d206d3f3)
---
 src/tm_mad/ssh/mv | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv
index edc38ee81d..967d5d1509 100755
--- a/src/tm_mad/ssh/mv
+++ b/src/tm_mad/ssh/mv
@@ -60,13 +60,6 @@ if [ `is_disk $DST_PATH` -eq 1 ]; then
     exit 0
 fi
 
-RANDOM_FILE=$(ssh "$DST_HOST" "mktemp -p \"$DST_DIR\"")
-trap "ssh $DST_HOST \"rm -f $RANDOM_FILE\"" EXIT TERM INT HUP
-if ssh "$SRC_HOST" "test -f $RANDOM_FILE"; then
-    log "Not moving $SRC to $DST, they are the same path"
-    exit 0
-fi
-
 if [ `lcm_state` -eq 60 ]; then
     log "Not moving files from $SRC_HOST in FT mode"
     exit 0
@@ -84,6 +77,13 @@ MONITOR=$(ssh_monitor_and_log "$SRC_HOST" "$MONITOR_CMD" 'Get .monitor')
 
 ssh_make_path "$DST_HOST" "$DST_PATH" "$MONITOR"
 
+RANDOM_FILE=$(ssh "$DST_HOST" "mktemp -p \"$DST_DIR\"")
+trap "ssh $DST_HOST \"rm -f $RANDOM_FILE\"" EXIT TERM INT HUP
+if ssh "$SRC_HOST" "test -f $RANDOM_FILE"; then
+    log "Not moving $SRC to $DST, they are the same path"
+    exit 0
+fi
+
 log "Moving $SRC to $DST"
 
 ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \