From e57620f0f3a77fafc620eec6e155c61d6f1653aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 30 May 2013 18:26:35 +0200 Subject: [PATCH] Feature #1852: Automatic scaling failure recovery --- flow/lcm/LifeCycleManager.rb | 6 ++++++ flow/lcm/strategy.rb | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index ab7dc8f6d2..bbf1e749cb 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -101,6 +101,12 @@ class ServiceLCM elsif !service.any_role_scaling? service.set_state(Service::STATE['RUNNING']) end + when Service::STATE['FAILED_SCALING'] + strategy.monitor_step(service) + + if !service.any_role_failed_scaling? + service.set_state(Service::STATE['SCALING']) + end when Service::STATE['UNKNOWN'] strategy.monitor_step(service) diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index 06ac7ad336..acee34cd2d 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -177,6 +177,10 @@ class Strategy if !OpenNebula.is_error?(rc) && role_nodes_done?(role) role.set_state(Role::STATE['DONE']) end + when Role::STATE['FAILED_SCALING'] + if !OpenNebula.is_error?(rc) && role_finished_scaling?(role) + role.set_state(Role::STATE['SCALING']) + end end } end @@ -264,8 +268,13 @@ protected role.get_nodes.each { |node| if node && node['vm_info'] vm_state = node['vm_info']['VM']['STATE'] - + if vm_state == '7' # FAILED + + # TODO: return error message and log it into the service log + #msg = "Role #{role.name()} : VM #{node['deploy_id']} found in FAILED state" + #Log.error LOG_COMP, msg + return true end end @@ -303,4 +312,8 @@ protected return any_node_failed?(role) end + + def role_finished_scaling?(role) + return role_nodes_running?(role) && role.get_nodes.size() == role.cardinality() + end end