puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(QENG-1873) Fix Key Name Issue And minmax

Browse source 
This commit fixes the problem of lingering :timings that were renamed
to :duration. This should resolve a NilClass failure. This also converts
string results from redis to float so that future minmax calls will
treat them as numerics instead of strings.
This commit is contained in:
Colin 2015-02-24 08:52:33 -08:00
parent ef333ca65f
commit 57520ae995
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmpooler/api.rb
View file

@ -268,10 +268,10 @@ module Vmpooler
result[:clone][:total] += me[:clone][:total] result[:clone][:total] += me[:clone][:total]
total_clones_per_day.push(me[:clone][:total]) total_clones_per_day.push(me[:clone][:total])
clone_times = $redis.hvals('vmpooler__clone__' + date.to_s) clone_times = $redis.hvals('vmpooler__clone__' + date.to_s).map(&:to_f)
unless clone_times.nil? or clone_times.empty? unless clone_times.nil? or clone_times.empty?
clone_time = clone_times.map(&:to_f).reduce(:+).to_f clone_time = clone_times.reduce(:+).to_f
total_clone_time += clone_time total_clone_time += clone_time
me[:clone][:min], me[:clone][:max] = clone_times.minmax me[:clone][:min], me[:clone][:max] = clone_times.minmax
@ -293,8 +293,8 @@ module Vmpooler
# again, calc clone_average if we had clones. # again, calc clone_average if we had clones.
if result[:clone][:total] > 0 if result[:clone][:total] > 0
result[:clone][:timings][:average] = total_clone_time / result[:clone][:total] result[:clone][:duration][:average] = total_clone_time / result[:clone][:total]
result[:clone][:timings][:min], result[:clone][:timings][:max] = min_max_clone_times.minmax result[:clone][:duration][:min], result[:clone][:duration][:max] = min_max_clone_times.minmax
result[:clone][:min], result[:clone][:max] = total_clones_per_day.minmax result[:clone][:min], result[:clone][:max] = total_clones_per_day.minmax
result[:clone][:average] = mean(total_clones_per_day) result[:clone][:average] = mean(total_clones_per_day)
end end