From 3709c21e5fd9f1eb1d396a8cebd3cc58d3a5e295 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Fri, 16 Oct 2020 13:43:28 +0200 Subject: [PATCH] M #-: fix minor bug in OneFlow sched policy (#324) (cherry picked from commit a730b9c22c0f9da5dd67423a60a0401b119aea0d) --- src/flow/lib/models/role.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb index 893855644f..0b4a2fcd8e 100644 --- a/src/flow/lib/models/role.rb +++ b/src/flow/lib/models/role.rb @@ -770,9 +770,9 @@ module OpenNebula scheduled_pol ||= [] scheduled_pol.each do |policy| - diff = scale_time?(policy) + diff, cooldown_duration = scale_time?(policy) - return [diff, 0] if diff != 0 + return [diff, cooldown_duration] if diff != 0 end elasticity_pol.each do |policy| @@ -951,10 +951,11 @@ module OpenNebula new_cardinality = calculate_new_cardinality(elasticity_pol) - return new_cardinality - cardinality + return [new_cardinality - cardinality, + elasticity_pol['cooldown']] end - 0 + [0, elasticity_pol['cooldown']] end # Returns a positive, 0, or negative number of nodes to adjust,