From c67ad5f14fd06364be84d86d63c4bf0cdcc12984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 13 Jun 2013 15:44:13 +0200 Subject: [PATCH 1/8] Feature #2109: Remove FAILED state --- flow/client/lib/appflow_client.rb | 32 ++++++++----------- flow/lcm/LifeCycleManager.rb | 8 +---- flow/lcm/strategy.rb | 7 ---- flow/lcm/strategy/straight.rb | 1 - flow/models/Role.rb | 16 ++++------ flow/models/Service.rb | 19 +++++------ .../public/js/apptools-appflow-services.js | 2 -- 7 files changed, 30 insertions(+), 55 deletions(-) diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index 6e5a0b2ddc..5a8749b4d7 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -43,14 +43,13 @@ module Role 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'FAILED' => 4, - 'UNKNOWN' => 5, - 'DONE' => 6, - 'FAILED_UNDEPLOYING' => 7, - 'FAILED_DEPLOYING' => 8, - 'SCALING' => 9, - 'FAILED_SCALING' => 10, - 'COOLDOWN' => 11 + 'UNKNOWN' => 4, + 'DONE' => 5, + 'FAILED_UNDEPLOYING' => 6, + 'FAILED_DEPLOYING' => 7, + 'SCALING' => 8, + 'FAILED_SCALING' => 9, + 'COOLDOWN' => 10 } STATE_STR = [ @@ -58,7 +57,6 @@ module Role 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'FAILED', 'UNKNOWN', 'DONE', 'FAILED_UNDEPLOYING', @@ -83,14 +81,13 @@ module Service 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'FAILED' => 4, - 'UNKNOWN' => 5, - 'DONE' => 6, - 'FAILED_UNDEPLOYING' => 7, - 'FAILED_DEPLOYING' => 8, - 'SCALING' => 9, - 'FAILED_SCALING' => 10, - 'COOLDOWN' => 11 + 'UNKNOWN' => 4, + 'DONE' => 5, + 'FAILED_UNDEPLOYING' => 6, + 'FAILED_DEPLOYING' => 7, + 'SCALING' => 8, + 'FAILED_SCALING' => 9, + 'COOLDOWN' => 10 } STATE_STR = [ @@ -98,7 +95,6 @@ module Service 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'FAILED', 'UNKNOWN', 'DONE', 'FAILED_UNDEPLOYING', diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index dc14361949..ae75308008 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -117,12 +117,6 @@ class ServiceLCM if !service.any_role_failed_scaling? service.set_state(Service::STATE['SCALING']) end - when Service::STATE['FAILED'] - strategy.monitor_step(service) - - if service.all_roles_running? - service.set_state(Service::STATE['RUNNING']) - end when Service::STATE['UNDEPLOYING'] strategy.monitor_step(service) @@ -133,7 +127,7 @@ class ServiceLCM else rc = strategy.shutdown_step(service) if !rc[0] - service.set_state(Service::STATE['FAILED']) + service.set_state(Service::STATE['FAILED_UNDEPLOYING']) end end #when Service::STATE['FAILED_DEPLOYING'] diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index 36e346e46a..df58672003 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -170,12 +170,6 @@ class Strategy if role_nodes_running?(role) role.set_state(Role::STATE['RUNNING']) end - when Role::STATE['FAILED'] - if OpenNebula.is_error?(rc) - role.set_state(Role::STATE['UNKNOWN']) - elsif role_nodes_running?(role) - role.set_state(Role::STATE['RUNNING']) - end when Role::STATE['UNDEPLOYING'] if OpenNebula.is_error?(rc) role.set_state(Role::STATE['FAILED_UNDEPLOYING']) @@ -241,7 +235,6 @@ protected def get_roles_shutdown(service) result = service.get_roles.select {|name, role| ![Role::STATE['UNDEPLOYING'], - Role::STATE['FAILED'], Role::STATE['DONE'], Role::STATE['FAILED_UNDEPLOYING'], Role::STATE['FAILED_DEPLOYING']].include?(role.state) diff --git a/flow/lcm/strategy/straight.rb b/flow/lcm/strategy/straight.rb index 06dba65108..c0ab39bb6c 100644 --- a/flow/lcm/strategy/straight.rb +++ b/flow/lcm/strategy/straight.rb @@ -121,7 +121,6 @@ module Straight roles.each { |name, role| # All roles can be shutdown, except the ones in these states if (![Role::STATE['UNDEPLOYING'], - Role::STATE['FAILED'], Role::STATE['DONE'], Role::STATE['FAILED_UNDEPLOYING'], Role::STATE['FAILED_DEPLOYING']].include?(role.state) ) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 5bd721309d..8d1edd0580 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -44,14 +44,13 @@ module OpenNebula 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'FAILED' => 4, - 'UNKNOWN' => 5, - 'DONE' => 6, - 'FAILED_UNDEPLOYING' => 7, - 'FAILED_DEPLOYING' => 8, - 'SCALING' => 9, - 'FAILED_SCALING' => 10, - 'COOLDOWN' => 11 + 'UNKNOWN' => 4, + 'DONE' => 5, + 'FAILED_UNDEPLOYING' => 6, + 'FAILED_DEPLOYING' => 7, + 'SCALING' => 8, + 'FAILED_SCALING' => 9, + 'COOLDOWN' => 10 } STATE_STR = [ @@ -59,7 +58,6 @@ module OpenNebula 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'FAILED', 'UNKNOWN', 'DONE', 'FAILED_UNDEPLOYING', diff --git a/flow/models/Service.rb b/flow/models/Service.rb index a267a5e0a0..f75ebbb659 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -24,14 +24,13 @@ module OpenNebula 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'FAILED' => 4, - 'UNKNOWN' => 5, - 'DONE' => 6, - 'FAILED_UNDEPLOYING' => 7, - 'FAILED_DEPLOYING' => 8, - 'SCALING' => 9, - 'FAILED_SCALING' => 10, - 'COOLDOWN' => 11 + 'UNKNOWN' => 4, + 'DONE' => 5, + 'FAILED_UNDEPLOYING' => 6, + 'FAILED_DEPLOYING' => 7, + 'SCALING' => 8, + 'FAILED_SCALING' => 9, + 'COOLDOWN' => 10 } STATE_STR = [ @@ -39,7 +38,6 @@ module OpenNebula 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'FAILED', 'UNKNOWN', 'DONE', 'FAILED_UNDEPLOYING', @@ -132,8 +130,7 @@ module OpenNebula # @return [true, false] true if any of the roles is in failed state def any_role_failed?() failed_states = [ - Role::STATE['FAILED'], - Role::STATE['FAILED_DEPLOYING'], + Role::STATE['FAILED_DEPLOYING'], Role::STATE['FAILED_UNDEPLOYING']] @roles.each { |name, role| diff --git a/flow/sunstone/public/js/apptools-appflow-services.js b/flow/sunstone/public/js/apptools-appflow-services.js index c2e96815ed..7715530a24 100644 --- a/flow/sunstone/public/js/apptools-appflow-services.js +++ b/flow/sunstone/public/js/apptools-appflow-services.js @@ -60,7 +60,6 @@ var Service = { tr("DEPLOYING"), tr("RUNNING"), tr("UNDEPLOYING"), - tr("FAILED"), tr("UNKNOWN"), tr("DONE"), tr("FAILED_UNDEPLOYING"), @@ -83,7 +82,6 @@ var Role = { tr("DEPLOYING"), tr("RUNNING"), tr("UNDEPLOYING"), - tr("FAILED"), tr("UNKNOWN"), tr("DONE"), tr("FAILED_UNDEPLOYING"), From d261d6a2765912007a806540e5bf8f7ec10a86eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 13 Jun 2013 16:40:21 +0200 Subject: [PATCH 2/8] Feature #2109: Monitor services in failed deployment and undeployment In some cases, the operation continues automatically if the problem is fixed --- flow/lcm/LifeCycleManager.rb | 24 ++++++++++++------------ flow/lcm/strategy.rb | 6 +++++- flow/models/Service.rb | 6 ++++++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index ae75308008..08e27267ef 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -130,18 +130,18 @@ class ServiceLCM service.set_state(Service::STATE['FAILED_UNDEPLOYING']) end end - #when Service::STATE['FAILED_DEPLOYING'] - # strategy.monitor_step(service) -# - # if !service.any_role_failed? - # service.set_state(Service::STATE['DEPLOYING']) - # end - #when Service::STATE['FAILED_UNDEPLOYING'] - # strategy.monitor_step(service) -# - # if !service.any_role_failed? - # service.set_state(Service::STATE['UNDEPLOYING']) - # end + when Service::STATE['FAILED_DEPLOYING'] + strategy.monitor_step(service) + + if !service.any_role_failed? + service.set_state(Service::STATE['DEPLOYING']) + end + when Service::STATE['FAILED_UNDEPLOYING'] + strategy.monitor_step(service) + + if !service.any_role_failed? + service.set_state(Service::STATE['UNDEPLOYING']) + end end rc = service.update() diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index df58672003..9c14c33a92 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -180,7 +180,7 @@ class Strategy end when Role::STATE['FAILED_DEPLOYING'] if !OpenNebula.is_error?(rc) && role_nodes_running?(role) - role.set_state(Role::STATE['PENDING']) + role.set_state(Role::STATE['RUNNING']) end when Role::STATE['FAILED_UNDEPLOYING'] if !OpenNebula.is_error?(rc) && role_nodes_done?(role) @@ -252,6 +252,10 @@ protected # @param [Role] role # @return [true|false] def role_nodes_running?(role) + if role.get_nodes.size() != role.cardinality() + return false + end + role.get_nodes.each { |node| if node && node['vm_info'] vm_state = node['vm_info']['VM']['STATE'] diff --git a/flow/models/Service.rb b/flow/models/Service.rb index f75ebbb659..f2f5922a35 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -207,6 +207,12 @@ module OpenNebula # otherwise def recover if [Service::STATE['FAILED_DEPLOYING']].include?(self.state) + @roles.each do |name, role| + if role.state == Role::STATE['FAILED_DEPLOYING'] + role.set_state(Role::STATE['PENDING']) + end + end + self.set_state(Service::STATE['DEPLOYING']) elsif self.state == Service::STATE['FAILED_SCALING'] From 177bdc46ee7649c0bb482ef9cd620863d493f2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 13 Jun 2013 17:39:01 +0200 Subject: [PATCH 3/8] Feature #2109: Recover for failed deployments now cleans VMs in failed and done --- flow/models/Role.rb | 49 ++++++++++++++++++++++++++++++++++++++++++ flow/models/Service.rb | 1 + 2 files changed, 50 insertions(+) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 8d1edd0580..c2d5249c64 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -764,5 +764,54 @@ module OpenNebula def update(template) set_cardinality(template["cardinality"]) end + + ######################################################################## + # Recover + ######################################################################## + + def recover_deployment() + + nodes = @body['nodes'] + new_nodes = [] + disposed_nodes = @body['disposed_nodes'] + + nodes.each do |node| + vm_state = nil + + if node['vm_info'] && node['vm_info']['VM'] && node['vm_info']['VM']['STATE'] + vm_state = node['vm_info']['VM']['STATE'] + end + + if vm_state == '6' # DONE + # Store the VM id in the array of disposed nodes + disposed_nodes << vm_id + + elsif vm_state == '7' # FAILED + vm_id = node['deploy_id'] + + vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) + rc = vm.finalize + + if !OpenNebula.is_error?(rc) + # Store the VM id in the array of disposed nodes + disposed_nodes << vm_id + + Log.debug LOG_COMP, "Role #{name} : Delete success for VM #{vm_id}", @service.id() + else + msg = "Role #{name} : Delete failed for VM #{vm_id}; #{rc.message}" + Log.error LOG_COMP, msg, @service.id() + @service.log_error(msg) + + success = false + + new_nodes << node + end + else + new_nodes << node + end + end + + @body['nodes'] = new_nodes + end end end diff --git a/flow/models/Service.rb b/flow/models/Service.rb index f2f5922a35..7890b57866 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -210,6 +210,7 @@ module OpenNebula @roles.each do |name, role| if role.state == Role::STATE['FAILED_DEPLOYING'] role.set_state(Role::STATE['PENDING']) + role.recover_deployment() end end From 4ac5a902fedd0b9adcf2eb7ff5036811f321a523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 13 Jun 2013 18:05:10 +0200 Subject: [PATCH 4/8] Feature #2109: Recover for failed shutdowns now retries to delete VMs --- flow/models/Service.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flow/models/Service.rb b/flow/models/Service.rb index 7890b57866..d220c4ead4 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -227,6 +227,12 @@ module OpenNebula self.set_state(Service::STATE['SCALING']) elsif self.state == Service::STATE['FAILED_UNDEPLOYING'] + @roles.each do |name, role| + if role.state == Role::STATE['FAILED_UNDEPLOYING'] + role.set_state(Role::STATE['RUNNING']) + end + end + self.set_state(Service::STATE['UNDEPLOYING']) elsif self.state == Service::STATE['COOLDOWN'] From d363368f7d98c418c10c74830b938f61d2eb414e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 14 Jun 2013 12:39:42 +0200 Subject: [PATCH 5/8] Feature #2109: Fix bug --- flow/models/Role.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index c2d5249c64..8700ba3798 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -777,6 +777,7 @@ module OpenNebula nodes.each do |node| vm_state = nil + vm_id = node['deploy_id'] if node['vm_info'] && node['vm_info']['VM'] && node['vm_info']['VM']['STATE'] vm_state = node['vm_info']['VM']['STATE'] @@ -787,8 +788,6 @@ module OpenNebula disposed_nodes << vm_id elsif vm_state == '7' # FAILED - vm_id = node['deploy_id'] - vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) rc = vm.finalize From f71f7e530ad87e382e67466e13e858a730c4825b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 14 Jun 2013 12:54:50 +0200 Subject: [PATCH 6/8] Feature #2109: Recover for unknown now cleans VMs in failed and done --- flow/models/Role.rb | 10 ++++++++++ flow/models/Service.rb | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 8700ba3798..31397e3329 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -769,7 +769,17 @@ module OpenNebula # Recover ######################################################################## + def recover_deployment() + delete_failed_done() + end + + def recover_unknown() + delete_failed_done() + deploy() + end + + def delete_failed_done() nodes = @body['nodes'] new_nodes = [] diff --git a/flow/models/Service.rb b/flow/models/Service.rb index d220c4ead4..c61b57b5e3 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -244,6 +244,13 @@ module OpenNebula self.set_state(Service::STATE['RUNNING']) + elsif self.state == Service::STATE['UNKNOWN'] + @roles.each do |name, role| + if role.state == Role::STATE['UNKNOWN'] + role.recover_unknown() + end + end + else return OpenNebula::Error.new("Action recover: Wrong state" \ " #{self.state_str()}") From 5c0ddabe9a2a3c2f7af7e280089ca889237110df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 14 Jun 2013 13:01:42 +0200 Subject: [PATCH 7/8] Feature #2109: Rename state UNKNOWN to WARNING --- flow/client/bin/appflow | 2 +- flow/client/lib/appflow_client.rb | 8 ++++---- flow/doc/states.dot | 6 +++--- flow/lcm/LifeCycleManager.rb | 6 +++--- flow/lcm/strategy.rb | 6 +++--- flow/models/Role.rb | 6 +++--- flow/models/Service.rb | 14 +++++++------- .../public/js/apptools-appflow-services.js | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index 886a5ff40b..e2a0dfb022 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -459,7 +459,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do shutdown_desc = <<-EOT.unindent Shutdown a service. - From RUNNING or UNKNOWN shuts down the Service + From RUNNING or WARNING shuts down the Service EOT command :shutdown, shutdown_desc, [:range, :service_id_list] do diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index 5a8749b4d7..f707012605 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -43,7 +43,7 @@ module Role 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'UNKNOWN' => 4, + 'WARNING' => 4, 'DONE' => 5, 'FAILED_UNDEPLOYING' => 6, 'FAILED_DEPLOYING' => 7, @@ -57,7 +57,7 @@ module Role 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'UNKNOWN', + 'WARNING', 'DONE', 'FAILED_UNDEPLOYING', 'FAILED_DEPLOYING', @@ -81,7 +81,7 @@ module Service 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'UNKNOWN' => 4, + 'WARNING' => 4, 'DONE' => 5, 'FAILED_UNDEPLOYING' => 6, 'FAILED_DEPLOYING' => 7, @@ -95,7 +95,7 @@ module Service 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'UNKNOWN', + 'WARNING', 'DONE', 'FAILED_UNDEPLOYING', 'FAILED_DEPLOYING', diff --git a/flow/doc/states.dot b/flow/doc/states.dot index 4de9f7d932..5069203a17 100644 --- a/flow/doc/states.dot +++ b/flow/doc/states.dot @@ -19,7 +19,7 @@ digraph AppFlow { end [ width=0.15, height=0.15, shape=point ]; - running [ label="running /\nunknown"]; + running [ label="running /\nwarning"]; subgraph { rank = min; user; pending} subgraph { rank = same; deploying; failed_deploying; color="white"} @@ -37,8 +37,8 @@ digraph AppFlow { done -> end [label="delete"]; -// running -> unknown [style="dotted"]; -// unknown -> running [style="dotted"]; +// running -> warning [style="dotted"]; +// warning -> running [style="dotted"]; running -> scaling [style="dashed"]; scaling -> running [style="dashed"]; diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index 08e27267ef..555f322fd8 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -69,16 +69,16 @@ class ServiceLCM service.set_state(Service::STATE['FAILED_DEPLOYING']) end end - when Service::STATE['RUNNING'], Service::STATE['UNKNOWN'] + when Service::STATE['RUNNING'], Service::STATE['WARNING'] strategy.monitor_step(service) if service.all_roles_running? - if service.state() == Service::STATE['UNKNOWN'] + if service.state() == Service::STATE['WARNING'] service.set_state(Service::STATE['RUNNING']) end else if service.state() == Service::STATE['RUNNING'] - service.set_state(Service::STATE['UNKNOWN']) + service.set_state(Service::STATE['WARNING']) end end diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index 9c14c33a92..24a7c6b211 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -138,9 +138,9 @@ class Strategy case role.state() when Role::STATE['RUNNING'] if OpenNebula.is_error?(rc) - role.set_state(Role::STATE['UNKNOWN']) + role.set_state(Role::STATE['WARNING']) elsif !role_nodes_running?(role) - role.set_state(Role::STATE['UNKNOWN']) + role.set_state(Role::STATE['WARNING']) end when Role::STATE['DEPLOYING'] if OpenNebula.is_error?(rc) @@ -166,7 +166,7 @@ class Strategy if role.cooldown_over? role.set_state(Role::STATE['RUNNING']) end - when Role::STATE['UNKNOWN'] + when Role::STATE['WARNING'] if role_nodes_running?(role) role.set_state(Role::STATE['RUNNING']) end diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 31397e3329..25d85c2ba4 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -44,7 +44,7 @@ module OpenNebula 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'UNKNOWN' => 4, + 'WARNING' => 4, 'DONE' => 5, 'FAILED_UNDEPLOYING' => 6, 'FAILED_DEPLOYING' => 7, @@ -58,7 +58,7 @@ module OpenNebula 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'UNKNOWN', + 'WARNING', 'DONE', 'FAILED_UNDEPLOYING', 'FAILED_DEPLOYING', @@ -774,7 +774,7 @@ module OpenNebula delete_failed_done() end - def recover_unknown() + def recover_warning() delete_failed_done() deploy() end diff --git a/flow/models/Service.rb b/flow/models/Service.rb index c61b57b5e3..0ece3d74f4 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -24,7 +24,7 @@ module OpenNebula 'DEPLOYING' => 1, 'RUNNING' => 2, 'UNDEPLOYING' => 3, - 'UNKNOWN' => 4, + 'WARNING' => 4, 'DONE' => 5, 'FAILED_UNDEPLOYING' => 6, 'FAILED_DEPLOYING' => 7, @@ -38,7 +38,7 @@ module OpenNebula 'DEPLOYING', 'RUNNING', 'UNDEPLOYING', - 'UNKNOWN', + 'WARNING', 'DONE', 'FAILED_UNDEPLOYING', 'FAILED_DEPLOYING', @@ -191,7 +191,7 @@ module OpenNebula def shutdown if [Service::STATE['RUNNING'], Service::STATE['FAILED_UNDEPLOYING'], - Service::STATE['UNKNOWN']].include?(self.state) + Service::STATE['WARNING']].include?(self.state) self.set_state(Service::STATE['UNDEPLOYING']) return self.update else @@ -244,10 +244,10 @@ module OpenNebula self.set_state(Service::STATE['RUNNING']) - elsif self.state == Service::STATE['UNKNOWN'] + elsif self.state == Service::STATE['WARNING'] @roles.each do |name, role| - if role.state == Role::STATE['UNKNOWN'] - role.recover_unknown() + if role.state == Role::STATE['WARNING'] + role.recover_warning() end end @@ -353,7 +353,7 @@ module OpenNebula def update_role(role_name, template_json) - if ![Service::STATE['RUNNING'], Service::STATE['UNKNOWN']].include?(self.state) + if ![Service::STATE['RUNNING'], Service::STATE['WARNING']].include?(self.state) return OpenNebula::Error.new("Update role: Wrong state" \ " #{self.state_str()}") end diff --git a/flow/sunstone/public/js/apptools-appflow-services.js b/flow/sunstone/public/js/apptools-appflow-services.js index 7715530a24..2e7acbdb78 100644 --- a/flow/sunstone/public/js/apptools-appflow-services.js +++ b/flow/sunstone/public/js/apptools-appflow-services.js @@ -60,7 +60,7 @@ var Service = { tr("DEPLOYING"), tr("RUNNING"), tr("UNDEPLOYING"), - tr("UNKNOWN"), + tr("WARNING"), tr("DONE"), tr("FAILED_UNDEPLOYING"), tr("FAILED_DEPLOYING"), @@ -82,7 +82,7 @@ var Role = { tr("DEPLOYING"), tr("RUNNING"), tr("UNDEPLOYING"), - tr("UNKNOWN"), + tr("WARNING"), tr("DONE"), tr("FAILED_UNDEPLOYING"), tr("FAILED_DEPLOYING"), From 3f450c52e616d11f64016cb2716cd25538c25843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 18 Jun 2013 11:50:36 +0200 Subject: [PATCH 8/8] Feature #2109: Recover for unknown performs a boot for VMs in unknown --- flow/models/Role.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 25d85c2ba4..0bfc9ac020 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -775,7 +775,24 @@ module OpenNebula end def recover_warning() + @body['nodes'].each do |node| + vm_state = nil + lcm_state = nil + vm_id = node['deploy_id'] + + if node['vm_info'] && node['vm_info']['VM'] + vm_state = node['vm_info']['VM']['STATE'] + lcm_state = node['vm_info']['VM']['LCM_STATE'] + end + + if vm_state == '3' && lcm_state == '16' # UNKNOWN + vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) + vm.boot + end + end + delete_failed_done() + deploy() end