From 891eece59b5e531ac402609fb13d6c5abbbb93eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 5 Jun 2013 12:02:14 +0200 Subject: [PATCH] Feature #1852: Reset the number of true evaluations when a scale action is triggered --- flow/models/Role.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index a00b3a8673..8cf2b6e229 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -138,6 +138,17 @@ module OpenNebula @body['state'] = state.to_s + if state == STATE['SCALING'] + + elasticity_pol = @body['elasticity_policies'] + + if !elasticity_pol.nil? + elasticity_pol.each do |policy| + policy.delete('true_evals') + end + end + end + Log.info LOG_COMP, "Role #{name} new state: #{STATE_STR[state]}", @service.id() return true @@ -510,10 +521,8 @@ module OpenNebula elsif (adjust < 0) new_cardinality = min if new_cardinality < min end - - new_evals = 0 else - Log.debug "ELAS", "Role #{name} expression '#{expression}' evaluation ignored, true #{new_up_evals} times, #{period_number} needed" + Log.debug "ELAS", "Role #{name} expression '#{expression}' evaluation ignored, true #{new_evals} times, #{period_number} needed" end end