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

fix error when delete image on vcenter using nfs (#3464)

Browse Source 
Signed-off-by: Carlos J. Herrera Matos <cherrera@opennebula.systems>
This commit is contained in:
Carlos J. Herrera 2019-07-03 06:48:18 -04:00 committed by Tino Vázquez
parent 86ebc3ee64
commit f127e717d3
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/datastore_mad/remotes/vcenter/rm
View File

@ -76,10 +76,52 @@ begin
if img_type != CDROM
# delete the disk
ds.delete_virtual_disk(img_src)
begin
retries ||= 0
ds.delete_virtual_disk(img_src)
rescue StandardError => e
if (retries += 1) < VCenterDriver::CONFIG[:retries]
message = "Delete DISK #{vm_ref} failed due to "\
"\"#{e.message}\"\n#{e.backtrace.join("\n")} "\
"on the attempt \##{retries}\n#{e.backtrace.join("\n")}"
else
message = "Delete DISK #{vm_ref} failed due to "\
"\"#{e.message}\"\n#{e.backtrace.join("\n")} "\
"on the final attempt\n#{e.backtrace.join("\n")}"
end
OpenNebula.log_error(message)
STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information]
sleep VCenterDriver::CONFIG[:retry_interval].to_i
retry if retries < VCenterDriver::CONFIG[:retries]
exit(-1)
end
else
# delete the CDROM iso
ds.delete_file(img_src)
begin
retries ||= 0
ds.delete_file(img_src)
rescue StandardError => e
if (retries += 1) < VCenterDriver::CONFIG[:retries]
message = "Delete CDROM #{vm_ref} failed due to "\
"\"#{e.message}\"\n#{e.backtrace.join("\n")} "\
"on the attempt \##{retries}\n#{e.backtrace.join("\n")}"
else
message = "Delete CDROM #{vm_ref} failed due to "\
"\"#{e.message}\"\n#{e.backtrace.join("\n")} "\
"on the final attempt\n#{e.backtrace.join("\n")}"
end
OpenNebula.log_error(message)
STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information]
sleep VCenterDriver::CONFIG[:retry_interval].to_i
retry if retries < VCenterDriver::CONFIG[:retries]
exit(-1)
end
end
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir)