From 859bf7ee419c3f255233aca33778e450ace2fe6b Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Tue, 28 Feb 2017 11:48:46 +0100
Subject: [PATCH]  B #5045: Fix for snapshots that takes too long in vCenter

---
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index bf748677dc..3d3e741cac 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -1750,7 +1750,23 @@ class VCenterVm
 
         vm          = connection.find_vm_template(deploy_id)
 
-        vm.CreateSnapshot_Task(snapshot_hash).wait_for_completion
+        # Removed wait_for_completion and added poll to remediate
+        # createsnapshot_task not returning due to vCenter/ESX 5.5
+        # default timeout of 15 minutes. Give up if task is not
+        # ended after a day (1440 minutes)
+        vm.CreateSnapshot_Task(snapshot_hash)
+
+        snapshot_found  = false
+        elapsed_minutes = 0
+
+        until snapshot_found || elapsed_minutes == 1440
+            if vm.snapshot && vm.snapshot.rootSnapshotList
+               snapshot = find_snapshot(vm.snapshot.rootSnapshotList, snapshot_name)
+               snapshot_found = !snapshot.nil?
+            end
+            sleep(60)
+            elapsed_minutes += 1
+        end
 
         return snapshot_name
     end