From adfe5e6c5b95543aa96c3336ce460e13c82b8685 Mon Sep 17 00:00:00 2001
From: Alejandro Huertas Herrero <ahuertas@opennebula.systems>
Date: Tue, 21 Apr 2020 18:27:47 +0200
Subject: [PATCH] B #4508: add multiple retries to sync time (#4567)

---
 src/vmm_mad/remotes/kvm/migrate       | 7 ++++++-
 src/vmm_mad/remotes/kvm/migrate_local | 7 ++++++-
 src/vmm_mad/remotes/kvm/restore       | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate
index 8581bffca4..3b7556694a 100755
--- a/src/vmm_mad/remotes/kvm/migrate
+++ b/src/vmm_mad/remotes/kvm/migrate
@@ -37,5 +37,10 @@ exec_and_log "virsh --connect $LIBVIRT_URI migrate --live $MIGRATE_OPTIONS $depl
     "Could not migrate $deploy_id to $dest_host"
 
 if [ "$SYNC_TIME" = "yes" ]; then
-    virsh --connect $QEMU_PROTOCOL://$dest_host/system domtime --sync $deploy_id >/dev/null 2>/dev/null || :
+    (
+        for i in $(seq 3); do
+            virsh --connect $QEMU_PROTOCOL://$dest_host/system domtime --sync $deploy_id && break
+            [ "$i" -gt 1 ] && sleep 6
+        done
+    ) &> /dev/null &
 fi
diff --git a/src/vmm_mad/remotes/kvm/migrate_local b/src/vmm_mad/remotes/kvm/migrate_local
index 1d1a0420b8..fea3d41025 100755
--- a/src/vmm_mad/remotes/kvm/migrate_local
+++ b/src/vmm_mad/remotes/kvm/migrate_local
@@ -38,5 +38,10 @@ virsh --connect $QEMU_PROTOCOL://$src_host/system \
     migrate --live $deploy_id $MIGRATE_OPTIONS $QEMU_PROTOCOL://$dest_host/system
 
 if [ "$SYNC_TIME" = "yes" ]; then
-    virsh --connect $QEMU_PROTOCOL://$dest_host/system domtime --sync $deploy_id >/dev/null 2>/dev/null || :
+    (
+        for i in $(seq 3); do
+            virsh --connect $QEMU_PROTOCOL://$dest_host/system domtime --sync $deploy_id && break
+            [ "$i" -gt 1 ] && sleep 6
+        done
+    ) &> /dev/null &
 fi
diff --git a/src/vmm_mad/remotes/kvm/restore b/src/vmm_mad/remotes/kvm/restore
index 183a1dda9b..3a0b6627d9 100755
--- a/src/vmm_mad/remotes/kvm/restore
+++ b/src/vmm_mad/remotes/kvm/restore
@@ -94,7 +94,12 @@ if [ $? -ne 0 ]; then
 fi
 
 if [ "$SYNC_TIME" = "yes" ]; then
-    virsh --connect $LIBVIRT_URI domtime --sync $DEPLOY_ID >/dev/null 2>/dev/null || :
+    (
+        for i in $(seq 3); do
+            virsh --connect $LIBVIRT_URI domtime --sync $DEPLOY_ID && break
+            [ "$i" -gt 1 ] && sleep 6
+        done
+    ) &> /dev/null &
 fi
 
 rm "$FILE"