shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

F #4913: create_snapshot replace wait_for_completion with an active wait only for vcenter 5.5 B#5045

Browse Source
This commit is contained in:
mcabrerizo 2017-04-03 10:18:48 +02:00
parent 931523738f
commit 36ce5e8233
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -1708,10 +1708,33 @@ class VirtualMachine
:quiesce => true
}
begin
@item.CreateSnapshot_Task(snapshot_hash).wait_for_completion
rescue Exception => e
raise "Cannot create snapshot for VM: #{e.message}\n#{e.backtrace}"
vcenter_version = @vi_client.vim.serviceContent.about.apiVersion rescue nil
if vcenter_version != "5.5"
begin
@item.CreateSnapshot_Task(snapshot_hash).wait_for_completion
rescue Exception => e
raise "Cannot create snapshot for VM: #{e.message}\n#{e.backtrace}"
end
else
# B#5045 - If vcenter is 5.5 the snapshot may take longer than
# 15 minutes and it does not report that it has finished using
# wait_for_completion we use an active wait instead with a
# timeout of 1440 minutes = 24 hours
@item.CreateSnapshot_Task(snapshot_hash)
snapshot_created = false
elapsed_minutes = 0
until snapshot_created || elapsed_minutes == 1440
if !!@item['snapshot']
current_snapshot = @item['snapshot.currentSnapshot'] rescue nil
snapshot_found = find_snapshot(@item['snapshot.rootSnapshotList'], snapshot_name)
snapshot_created = !!snapshot_found && !!current_snapshot && current_snapshot._ref == snapshot_found._ref
end
sleep(60)
elapsed_minutes += 1
end
end
return snap_id