From c0aa6e6558b57cb83b9c8d35e0bca7517fd0ab30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 4 Jun 2013 15:37:59 +0200 Subject: [PATCH] Feature #1852: Elasticity works also in the UNKNOWN Service state --- flow/lcm/LifeCycleManager.rb | 30 +++++++++++++++--------------- flow/lib/grammar.rb | 10 ++++++++++ flow/lib/grammar.treetop | 10 ++++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index ec74226519..0ed01695a0 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -69,19 +69,25 @@ class ServiceLCM service.set_state(Service::STATE['FAILED_DEPLOYING']) end end - when Service::STATE['RUNNING'] + when Service::STATE['RUNNING'], Service::STATE['UNKNOWN'] strategy.monitor_step(service) - if !service.all_roles_running? - service.set_state(Service::STATE['UNKNOWN']) + if service.all_roles_running? + if service.state() == Service::STATE['UNKNOWN'] + service.set_state(Service::STATE['RUNNING']) + end else - if strategy.apply_scaling_policies(service) - service.set_state(Service::STATE['SCALING']) + if service.state() == Service::STATE['RUNNING'] + service.set_state(Service::STATE['UNKNOWN']) + end + end - rc = strategy.scale_step(service) - if !rc[0] - service.set_state(Service::STATE['FAILED_SCALING']) - end + if strategy.apply_scaling_policies(service) + service.set_state(Service::STATE['SCALING']) + + rc = strategy.scale_step(service) + if !rc[0] + service.set_state(Service::STATE['FAILED_SCALING']) end end when Service::STATE['SCALING'] @@ -106,12 +112,6 @@ class ServiceLCM if !service.any_role_failed_scaling? service.set_state(Service::STATE['SCALING']) end - when Service::STATE['UNKNOWN'] - strategy.monitor_step(service) - - if service.all_roles_running? - service.set_state(Service::STATE['RUNNING']) - end when Service::STATE['FAILED'] strategy.monitor_step(service) diff --git a/flow/lib/grammar.rb b/flow/lib/grammar.rb index 21f99b818f..f75b486989 100644 --- a/flow/lib/grammar.rb +++ b/flow/lib/grammar.rb @@ -864,6 +864,16 @@ module ElasticityGrammar nodes.each { |node| if node && node['vm_info'] + + vm_state = node['vm_info']['VM']['STATE'] + lcm_state = node['vm_info']['VM']['LCM_STATE'] + + # Use values from VMs in RUNNING only + + if vm_state != '3' || lcm_state != '3' + next + end + if node['vm_info']['VM']['USER_TEMPLATE'][att] total += (node['vm_info']['VM']['USER_TEMPLATE'][att]).to_f n_nodes += 1 diff --git a/flow/lib/grammar.treetop b/flow/lib/grammar.treetop index 4abe3e1292..e8694f720a 100644 --- a/flow/lib/grammar.treetop +++ b/flow/lib/grammar.treetop @@ -160,6 +160,16 @@ grammar ElasticityGrammar nodes.each { |node| if node && node['vm_info'] + + vm_state = node['vm_info']['VM']['STATE'] + lcm_state = node['vm_info']['VM']['LCM_STATE'] + + # Use values from VMs in RUNNING only + + if vm_state != '3' || lcm_state != '3' + next + end + if node['vm_info']['VM']['USER_TEMPLATE'][att] total += (node['vm_info']['VM']['USER_TEMPLATE'][att]).to_f n_nodes += 1