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

B #4050: skip objects that are not processed (#4051)

Browse Source 
(cherry picked from commit 99fd76c1567e82ef3df3b3e07ae0b36a1167690c)
This commit is contained in:
Alejandro Huertas Herrero 2019-12-16 15:55:15 +01:00 committed by Ruben S. Montero
parent c1bb45c74b
commit b7dfe3a87e
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/oca/ruby/opennebula/pool.rb
View File

@ -261,27 +261,52 @@ module OpenNebula
return rc
end
# Iterates over pool pages
# size:: nil => default page size
# > 0 => page size
# state state of objects
# delete true to take always the first page
def each_page(size, state = -1, extended = false, delete = false)
# Iterates over pool page
def loop_page(size, state, extended)
current = 0
element = @pool_name.split('_')[0]
page = OpenNebula::XMLElement.new
loop do
page.initialize_xml(get_page(size, current, extended, state),
page.initialize_xml(get_page(size,
current,
extended,
state),
@pool_name)
break if page["//#{element}"].nil?
current += yield(element, page)
end
end
# Iterates over pool pages
# size:: nil => default page size
# > 0 => page size
# state state of objects
def each_page(size, state = -1, extended = false)
loop_page(size, state, extended) do |element, page|
page.each("//#{element}") do |obj|
yield(obj)
end
current += size unless delete
size
end
end
# Iterates over pool pages to delete them
# size:: nil => default page size
# > 0 => page size
# state state of objects
def each_page_delete(size, state = -1, extended = false)
loop_page(size, state, extended) do |element, page|
no_deleted = 0
page.each("//#{element}") do |obj|
no_deleted += 1 if !yield(obj)
end
no_deleted
end
end

11
src/onedb/onedb_live.rb
View File

@ -217,15 +217,18 @@ class OneDBLive
end_time = ops[:end_time].to_i
done = OpenNebula::VirtualMachine::VM_STATE.index('DONE')
vmpool.each_page(ops[:pages], done, false, true) do |obj|
print "VM with ID: #{obj['ID']} purged \r"
vmpool.each_page_delete(ops[:pages], done, false) do |obj|
time = obj['ETIME'].to_i
next unless time >= start_time && time < end_time
# return false because the VM wasn't deleted
next false unless time >= start_time && time < end_time
print "VM with ID: #{obj['ID']} purged \r"
delete('vm_pool', "oid = #{obj['ID']}", false)
delete('history', "vid = #{obj['ID']}", false)
true
end
end