Feature #2109: Remove FAILED state

This commit is contained in:
Carlos Martín committed 2013-06-13 15:44:13 +02:00
1 parent f557b0e451
commit c67ad5f14f
7 files changed
+30 -55

No files matched your search

+14 -18
View File
@@ -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',
+1 -7
View File
@@ -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']
-7
View File
@@ -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)
-1
View File
@@ -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) )
+7 -9
View File
@@ -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',
+8 -11
View File
@@ -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|
@@ -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"),