shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-29 18:50:08 +03:00
Code Releases Wiki Activity

Feature #3654: Add new failure states to oneflow

Browse Source 
(cherry picked from commit bd056779949df7929f7d5549d65e1bc9a5ff742c)
This commit is contained in:
Carlos Martín 2015-03-30 13:28:51 +02:00 committed by Ruben S. Montero
parent 21cf03c43b
commit 1b0f23e17d
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flow/lib/models/role.rb
View File

@ -861,9 +861,15 @@ module OpenNebula
new_nodes << node
end
elsif vm_state == '3' && lcm_state == '16' # UNKNOWN
elsif (vm_state == '3' &&
(lcm_state == '16' || # UNKNOWN
lcm_state == '36' || # BOOT_FAILURE
lcm_state == '37')) # BOOT_MIGRATE_FAILURE
vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client)
vm.boot
new_nodes << node
else
new_nodes << node
end

17
src/flow/lib/strategy.rb
View File

@ -276,8 +276,21 @@ protected
vm_state = node['vm_info']['VM']['STATE']
lcm_state = node['vm_info']['VM']['LCM_STATE']
# UNKNOWN or FAILED
if (vm_state == '3' && lcm_state == '16') || vm_state == '7'
if vm_state == '7' || # FAILED
(vm_state == '3' && # ACTIVE
( lcm_state == '14' || # FAILURE
lcm_state == '16' || # UNKNOWN
lcm_state == '36' || # BOOT_FAILURE
lcm_state == '37' || # BOOT_MIGRATE_FAILURE
lcm_state == '38' || # PROLOG_MIGRATE_FAILURE
lcm_state == '39' || # PROLOG_FAILURE
lcm_state == '40' || # EPILOG_FAILURE
lcm_state == '41' || # EPILOG_STOP_FAILURE
lcm_state == '42' || # EPILOG_UNDEPLOY_FAILURE
lcm_state == '44' || # PROLOG_MIGRATE_POWEROFF_FAILURE
lcm_state == '46' ) # PROLOG_MIGRATE_SUSPEND_FAILURE
)
return true
end
end