From 56bd0157b00ddfdcfd13d095989d71dfbb6e561a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 19 Jun 2013 15:13:24 +0200 Subject: [PATCH] Feature #2109: Recover action for any failed state deletes DONE and FAILED, and performs a boot on UNK VMs --- flow/models/Role.rb | 33 +++++++++++++-------------------- flow/models/Service.rb | 2 +- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 76d1cf3189..9ca55a5304 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -776,32 +776,21 @@ module OpenNebula def recover_deployment() - delete_failed_done() + recover() 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() - + recover() deploy() end - def delete_failed_done() + def recover_scale() + recover() + retry_scale() + end + + # Deletes VMs in DONE or FAILED, and sends a boot action to VMs in UNKNOWN + def recover() nodes = @body['nodes'] new_nodes = [] @@ -813,6 +802,7 @@ module OpenNebula if node['vm_info'] && node['vm_info']['VM'] && node['vm_info']['VM']['STATE'] vm_state = node['vm_info']['VM']['STATE'] + lcm_state = node['vm_info']['VM']['LCM_STATE'] end if vm_state == '6' # DONE @@ -837,6 +827,9 @@ module OpenNebula new_nodes << node end + elsif vm_state == '3' && lcm_state == '16' # UNKNOWN + vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) + vm.boot else new_nodes << node end diff --git a/flow/models/Service.rb b/flow/models/Service.rb index 0ece3d74f4..d16b83384b 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -219,7 +219,7 @@ module OpenNebula elsif self.state == Service::STATE['FAILED_SCALING'] @roles.each do |name, role| if role.state == Role::STATE['FAILED_SCALING'] - role.retry_scale() + role.recover_scale() role.set_state(Role::STATE['SCALING']) end end