From da4df4fa4e47f782bbf69f9177c1795fe0742ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 19 Jun 2013 16:47:52 +0200 Subject: [PATCH] Feature #2120: Shutdown action can be set for each role, service, or in appflow-server.conf --- flow/config/appflow-server.conf | 3 +++ flow/controllers/appflow-server.rb | 4 +++- flow/models/Role.rb | 21 ++++++++++++++++++++- flow/models/Service.rb | 4 ++++ flow/models/ServiceTemplate.rb | 8 ++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/flow/config/appflow-server.conf b/flow/config/appflow-server.conf index 7f9f0ab5cf..0241421002 100644 --- a/flow/config/appflow-server.conf +++ b/flow/config/appflow-server.conf @@ -33,6 +33,9 @@ # Default cooldown period after a scale operation, in seconds :default_cooldown: 300 +# Default shutdown action. Values: 'shutdown', 'shutdown-hard' +:shutdown_action: 'shutdown' + ############################################################# # Auth ############################################################# diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index 02aa4d9a5a..b96701ab41 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -61,6 +61,7 @@ end conf[:debug_level] ||= 2 conf[:lcm_interval] ||= 30 conf[:default_cooldown] ||= 300 +conf[:shutdown_action] ||= 'shutdown' conf[:auth] = 'opennebula' @@ -112,10 +113,11 @@ before do end ############################################################################## -# Cooldown config +# Defaults ############################################################################## Role.init_default_cooldown(conf[:default_cooldown]) +Role.init_default_shutdown(conf[:shutdown_action]) ############################################################################## # LCM thread diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 9ca55a5304..516a7e8932 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -294,6 +294,16 @@ module OpenNebula n_nodes = nodes.size end + action = @body['shutdown_action'] + + if action.nil? + action = @service.get_shutdown_action() + end + + if action.nil? + action = @@default_shutdown + end + n_nodes.times { |i| node = nodes[i] @@ -302,7 +312,12 @@ module OpenNebula Log.debug LOG_COMP, "Role #{name} : Shutting down VM #{vm_id}", @service.id() vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client) - rc = vm.shutdown + + if action == 'shutdown-hard' + rc = vm.shutdown(true) + else + rc = vm.shutdown + end if scale_down node['disposed'] = '1' @@ -766,6 +781,10 @@ module OpenNebula @@default_cooldown = default_cooldown end + def self.init_default_shutdown(shutdown_action) + @@default_shutdown = shutdown_action + end + def update(template) set_cardinality(template["cardinality"]) end diff --git a/flow/models/Service.rb b/flow/models/Service.rb index d16b83384b..a4c2493fa4 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -381,6 +381,10 @@ module OpenNebula return OpenNebula::Error.new("ROLE \"#{role_name}\" does not exist") end + def get_shutdown_action() + return @body['shutdown_action'] + end + private # @param [Logger::Severity] severity diff --git a/flow/models/ServiceTemplate.rb b/flow/models/ServiceTemplate.rb index f7d5eb3e81..84d62db7a2 100644 --- a/flow/models/ServiceTemplate.rb +++ b/flow/models/ServiceTemplate.rb @@ -38,6 +38,10 @@ module OpenNebula :type => :string } }, + 'shutdown_action' => { + :type => :string, + :required => false + }, 'min_vms' => { :type => :integer, :default => 1 @@ -136,6 +140,10 @@ module OpenNebula :enum => %w{none straight}, :default => 'none' }, + 'shutdown_action' => { + :type => :string, + :required => false + }, 'roles' => { :type => :array, :items => ROLE_SCHEMA,