From b17751a2d68616adf8a97a7a5e2688c8de06aebd Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Thu, 21 Nov 2013 16:17:48 +0100
Subject: [PATCH] bug #2464: do tm delete retry in the host

Also does not fail when the file/path does not exist
---
 src/tm_mad/common/delete | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/tm_mad/common/delete b/src/tm_mad/common/delete
index ed2953f573..58fe12ef61 100755
--- a/src/tm_mad/common/delete
+++ b/src/tm_mad/common/delete
@@ -44,14 +44,27 @@ DST_HOST=`arg_host $DST`
 
 log "Deleting $DST_PATH"
 
-delete_file="ssh $DST_HOST \"rm -rf $DST_PATH\""
+delete_file=$(cat <<EOF
+[ -e "$DST_PATH" ] || exit 0
 
-retry 10 "$delete_file"
+times=10
+function="rm -rf $DST_PATH"
 
-EXEC_RC=$?
+count=1
+
+ret=\$(\$function)
+error=\$?
+
+while [ \$count -lt \$times -a "\$error" != "0" ]; do
+    sleep 1
+    count=\$(( \$count + 1 ))
+    ret=\$(\$function)
+    error=\$?
+done
+
+[ "x\$error" = "x0" ]
+EOF
+)
+
+ssh_exec_and_log $DST_HOST "$delete_file" "Error deleting $DST_PATH"
 
-if [ $EXEC_RC -ne 0 ]; then
-    log_error "Command \"$delete_file\" failed: $EXEC_RC"
-    error_message "Error deleting $DST_PATH"
-    exit $EXEC_RC
-fi