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

Feature #3782: Update fsck. Image snapshots are in sync with their VM disks

Browse Source
This commit is contained in:
Carlos Martín 2015-07-20 16:00:18 +02:00
parent 5213c5a710
commit c9192651ae
1 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/onedb/fsck.rb
View File

@ -1650,9 +1650,6 @@ EOT
# Image quotas
img_usage = {}
# Datastore quotas
ds_usage = {}
@db.fetch("SELECT body FROM vm_pool WHERE #{where_filter} AND state<>6") do |vm_row|
vmdoc = Nokogiri::XML(vm_row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
@ -1679,33 +1676,6 @@ EOT
vol_used += size_elem.text.to_i
}
end
persistent = nil
if (!e.at_xpath("PERSISTENT").nil?)
persistent = e.at_xpath("PERSISTENT").text.upcase
end
if (persistent == "YES")
ds_id = nil
if (!e.at_xpath("DATASTORE_ID").nil?)
ds_id = e.at_xpath("DATASTORE_ID").text
end
if (!ds_id.nil?)
vmdoc.root.xpath("SNAPSHOTS[DISK_ID=#{e.at_xpath('DISK_ID').text}]/SNAPSHOT/SIZE").each { |size|
ds_usage[ds_id] = [0,0] if ds_usage[ds_id].nil?
ds_usage[ds_id][1] += size.text.to_i
}
end
else
vmdoc.root.xpath("SNAPSHOTS[DISK_ID=#{e.at_xpath('DISK_ID').text}]/SNAPSHOT/SIZE").each { |size|
vol_used += size.text.to_i
}
end
}
vms_used += 1
@ -1860,14 +1830,12 @@ EOT
new_elem.add_child(doc.create_element("RVMS_USED")).content = rvms.to_s
}
# Datastore quotas
ds_usage = {}
@db.fetch("SELECT body FROM image_pool WHERE #{where_filter}") do |img_row|
img_doc = Nokogiri::XML(img_row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
state = img_doc.root.at_xpath("STATE").text.to_i
img_doc.root.xpath("DATASTORE_ID").each { |e|
ds_usage[e.text] = [0,0] if ds_usage[e.text].nil?
ds_usage[e.text][0] += 1
@ -1876,13 +1844,9 @@ EOT
ds_usage[e.text][1] += size.text.to_i
}
# If the image is USED_PERS, the disk snapshot size is
# taken from the VM
if (state != 8)
img_doc.root.xpath("SNAPSHOTS/SNAPSHOT/SIZE").each { |size|
ds_usage[e.text][1] += size.text.to_i
}
end
img_doc.root.xpath("SNAPSHOTS/SNAPSHOT/SIZE").each { |size|
ds_usage[e.text][1] += size.text.to_i
}
}
end