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

Fix window_size for monitoring

Browse Source
This commit is contained in:
Daniel Molina 2011-07-12 21:36:33 +02:00
parent 4676806eb3
commit ae200c58f1
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/acct/accounting.rb
View File

@ -56,7 +56,7 @@ module OneWatch
# Upate the active VMs
@active_vms = new_active_vms.sort
WatchHelper::Vm.flush
WatchHelper::Vm.flush(@timestamp)
end
private

2
src/acct/monitoring.rb
View File

@ -12,7 +12,7 @@ module OneWatch
}
end
sql_elem.flush
sql_elem.flush(timestamp)
end
private

30
src/acct/watch_helper.rb
View File

@ -340,17 +340,20 @@ module WatchHelper
@@deltas_cache << hash
end
def self.flush
def self.flush(timestamp)
DB.transaction do
VmDelta.multi_insert(@@deltas_cache)
VmSample.multi_insert(@@samples_cache)
end
Vm.each { |vm|
if vm.samples.count > @@vm_window_size
vm.samples.first.destroy
end
}
step = WatchHelper::get_config(:STEP)
ws = WatchHelper::get_config(:VM_MONITORING,:WINDOW_SIZE)
vm_s = WatchHelper::get_config(:VM_MONITORING,:STEPS)
t = step*ws*vm_s
tl = timestamp - t
VmSample.filter('timestamp < ?', tl).destroy
@@samples_cache = []
@@deltas_cache = []
@ -396,16 +399,19 @@ module WatchHelper
@@samples_cache << hash
end
def self.flush
def self.flush(timestamp)
DB.transaction do
HostSample.multi_insert(@@samples_cache)
end
Host.all.each { |host|
if host.samples.count > @@host_window_size
host.samples.first.destroy
end
}
step = WatchHelper::get_config(:STEP)
ws = WatchHelper::get_config(:HOST_MONITORING,:WINDOW_SIZE)
vm_s = WatchHelper::get_config(:HOST_MONITORING,:STEPS)
t = step*ws*vm_s
tl = timestamp - t
HostSample.filter('timestamp < ?', tl).destroy
@@samples_cache = []
end