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"),