[PATCH conductor] Decrease amount of time we keep rotated logs.
by Jason Guiditta
52 weeks is a bit excessive. Also remove ref to script that has not
existed for months.
---
conf/aeolus-conductor.logrotate | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/conf/aeolus-conductor.logrotate b/conf/aeolus-conductor.logrotate
index c190b2c..e1929a4 100644
--- a/conf/aeolus-conductor.logrotate
+++ b/conf/aeolus-conductor.logrotate
@@ -1,5 +1,5 @@
weekly
-rotate 52
+rotate 4
compress
missingok
notifempty
@@ -17,10 +17,3 @@ notifempty
/etc/init.d/conductor-dbomatic restart
endscript
}
-
-/var/log/aeolus-conductor/warehouse_sync.log {
- sharedscripts
- postrotate
- /etc/init.d/conductor-warehouse_sync restart
- endscript
-}
--
1.7.7.6
12 years, 2 months
[PATCH conductor 0/1] #791195 - destroy_on_provider cleanup
by Matt Wagner
Hi all,
This is a rebased version of my earlier patch. (The code shouldn't have changed at all.)
The net effect here is just a cleanup and removal of (obsessive!) retrial of image deletion.
We had talked about a possible issue with deleting instances on RHEV. I had trouble reproducing it myself, though I don't doubt that it is happening. However, it sounds to me like this might be represented by https://issues.apache.org/jira/browse/DTACLOUD-148 on the Deltacloud side, and I'm reluctant to add provider-specific handling of image deletion in Conductor. I welcome feedback on whether this is indeed the right way to proceed, though.
-- Matt
12 years, 2 months
[PATCH aeolus-cli] BZ #795650: "This combination of parameters is not currently supported"
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=795650
This was a documentation error. As part of the fix, I added help
output on missing arguements. This should make it clearer what is
missing, and we can add similar handling elsewhere, should this pop
up again.
---
lib/aeolus_cli/command/build_command.rb | 3 +--
lib/aeolus_cli/command/config_parser.rb | 12 +++++++++---
man/aeolus-image-build.1 | 6 +++++-
spec/command/build_command_spec.rb | 18 ++++--------------
4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/lib/aeolus_cli/command/build_command.rb b/lib/aeolus_cli/command/build_command.rb
index 0741846..6945cfa 100644
--- a/lib/aeolus_cli/command/build_command.rb
+++ b/lib/aeolus_cli/command/build_command.rb
@@ -82,8 +82,7 @@ module Aeolus
def combo_implemented?
if @options[:template].empty? || @options[:target].empty? || @options[:environment].nil?
- puts "Error: This combination of parameters is not currently supported"
- quit(1)
+ raise ArgumentError, "Error: This combination of parameters is not currently supported"
end
true
end
diff --git a/lib/aeolus_cli/command/config_parser.rb b/lib/aeolus_cli/command/config_parser.rb
index 2615161..1401870 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -40,7 +40,13 @@ module Aeolus
puts opts
else
parse(opts)
- self.send((a)command.to_sym)
+ begin
+ self.send((a)command.to_sym)
+ rescue ArgumentError => e
+ puts "Warning, #{e.message}"
+ puts opts
+ exit(1)
+ end
end
else
puts generalOptions
@@ -152,8 +158,8 @@ module Aeolus
opts.separator ""
opts.separator "Examples:"
- opts.separator "aeolus-image build --target ec2 --template my.tmpl # build a new image for ec2 from based on the given template"
- opts.separator "aeolus-image build --target ec2,rhevm --template my.tmpl # build a new image for ec2 and for rhevm based on the given template"
+ opts.separator "aeolus-image build --target ec2 --template my.tmpl --environment default # build a new image for ec2 from based on the given template for the default environment"
+ opts.separator "aeolus-image build --target ec2,rhevm --template my.tmpl --environment default # build a new image for ec2 and for rhevm based on the given template for the default environment"
#opts.separator "aeolus-image build --image $image_id # (NOT IMPLEMENTED) rebuild the image template and targets from latest build"
#opts.separator %q{aeolus-image build --target ec2,rackspace \ # rebuild the image with a new template and set of targets
# --image $image_i \
diff --git a/man/aeolus-image-build.1 b/man/aeolus-image-build.1
index 38cd210..0c8d1ad 100644
--- a/man/aeolus-image-build.1
+++ b/man/aeolus-image-build.1
@@ -2,7 +2,7 @@
.SH NAME
aeolus-image build \- command for building aeolus images
.SH SYNOPSIS
-.B aeolus-image build [\-h|--help] [\-u|--username] [\-w|--password] [\-I|--image [image-id]] [\-e|--template [path-to-template]] [\-t|--targets [targets]] [\-d|--daemon]
+.B aeolus-image build [\-h|--help] [\-u|--username] [\-w|--password] [\-I|--image [image-id]] [\-e|--template [path-to-template]] [\-t|--targets [targets]] [\-E|--environment] [\-d|--daemon]
.SH DESCRIPTION
aeolus-image build command allows users to build new images based on a given TDL template file for a set of specified targets such e.g. EC2, RHEVM etc... See list man list target-images for information on how to list the completed builds.
.SH OPTIONS
@@ -19,6 +19,9 @@ Provide a list of targets for the build
\-e, --template
Provide path to a TDL template file for building against
.TP
+\-E, --environment
+Limit image list to environment
+.TP
\-d, --daemon
Run as a background process
.TP
@@ -30,6 +33,7 @@ Build a new image for ec2 based on the specified template TDL file template.tdl
.B aeolus-image build
\--targets ec2
\--template ./template.tdl
+\--environment default
.TP
Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
.SH SEE ALSO
diff --git a/spec/command/build_command_spec.rb b/spec/command/build_command_spec.rb
index c7ae408..f969aa4 100644
--- a/spec/command/build_command_spec.rb
+++ b/spec/command/build_command_spec.rb
@@ -74,17 +74,12 @@ module Aeolus
end
end
- it "should exit with a message if only image id is provided" do
+ it "should raise an ArgumentError if only image id is provided" do
@options.delete(:template)
@options.delete(:target)
@options[:image] = '825c94d1-1353-48ca-87b9-36f02e069a8d'
b = BuildCommand.new(@options, @output)
- begin
- b.run
- rescue SystemExit => e
- e.status.should == 1
- end
- $stdout.string.should include("This combination of parameters is not currently supported")
+ lambda {b.run}.should raise_error(ArgumentError)
end
it "should exit with appropriate message when a non compliant template is given" do
@@ -101,16 +96,11 @@ module Aeolus
end
describe "#combo_implemented?" do
- it "should give useful feedback if no template or target is specified" do
+ it "should raise an ArgumentError if required options are not specified" do
@options[:template] = ''
@options[:target] = []
b = BuildCommand.new(@options, @output)
- begin
- b.combo_implemented?
- rescue SystemExit => e
- e.status.should == 1
- end
- $stdout.string.should include("This combination of parameters is not currently supported")
+ lambda {b.combo_implemented?}.should raise_error(ArgumentError)
end
end
end
--
1.7.7.6
12 years, 2 months
[PATCH conductor] BZ790831 Change and remove out of date text in deployable details page
by Jirka Tomasek
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/views/deployables/show.html.haml | 4 +---
src/config/locales/en.yml | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index 772536f..3f8f544 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -56,11 +56,9 @@
%section.admin-content-section
- if @missing_images.empty?
%header
- %h2.build= t('.build')
+ %h2.build= t('.build_status')
.content
- %p.description.align-center= t('.build_description')
-
%ul#providers-list.catalog_pretty
- @build_results.each do |provider_type, results|
- results.each do |result|
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index ef7b615..693766c 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -847,6 +847,7 @@ en:
edit_xml: Edit XML
delete: Delete
build: Build
+ build_status: "Build Status"
start: Start
rebuild_all: Build missing images
push_all: Push missing images
@@ -860,9 +861,6 @@ en:
arch: ARCH
repair_images: Repair Images
images_valid: Images Valid
- build_description:
- "Allow this deployable's associated image(s) to be built and
- pushed to cloud resource providers by enabling them below."
catalog_name: Catalog name
environment: Environment
build_statuses_descriptions:
--
1.7.7.6
12 years, 2 months
RFC: Role name change
by Jason Guiditta
Hello list,
I was just looking at seeds.rb to see about extracting our role names
into i18n files so we can leverage the configuration I added there
last week, and noticed what seems to me to be a minor inconsistency.
Disregarding role with the name 'Administrator', it seems most of our
roles are named:
"{object name} user"
or
"{object name} owner"
There are 2 exceptions I see to this - the Instance and Deployment
objects. These both use 'Controller' instead of 'User'.
I would like to propose making those consistent as part of
the patch I am working on, unless there is some reason they are like
this of which I am unaware. Thoughts?
-j
12 years, 2 months
[PATCH] Fixes BZ 770618, enforcing unique pool names.
by kkeiter＠redhat.com
From: Kenneth Keiter <ken(a)kenkeiter.com>
---
src/app/models/pool.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 8529a9d..5d79cf3 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -51,7 +51,7 @@ class Pool < ActiveRecord::Base
validates_presence_of :quota
validates_presence_of :pool_family
validates_inclusion_of :enabled, :in => [true, false]
- validates_uniqueness_of :name
+ validates_uniqueness_of :name, :case_sensitive => false
validates_uniqueness_of :exported_as, :if => :exported_as
validates_length_of :name, :maximum => 255
--
1.7.4.1
12 years, 2 months
[PATCH conductor] BZ #795667: Build shows all old terms in UI
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=795667
Wont show if it isnt in the rpm...
---
aeolus-conductor.spec.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index bb23418..c899190 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -170,7 +170,7 @@ rhtml="app/views/layouts"
svg="public/images public/images/icons public/javascripts/jquery-svg"
ttf="public/fonts"
txt="public"
-yml="config config/locales"
+yml="config config/locales config/locales/overrides"
xml="app/util"
for filetype in builder css feature gif haml html ico jpg js json key opts png \
rake rb rhtml scss svg ttf txt yml xml; do
--
1.7.7.6
12 years, 2 months
[PATCH conductor] BZ 790860 - re-enable provider availability
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
If a provider was unavailable, it was never set as avaialable again.
---
src/app/models/provider.rb | 16 +++++++++++-----
src/spec/factories/provider.rb | 4 ++++
src/spec/models/instance_spec.rb | 6 +++++-
src/spec/models/provider_spec.rb | 17 +++++++++++++++++
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 1cbd99f..22e4e95 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -134,13 +134,19 @@ class Provider < ActiveRecord::Base
def populate_realms
reload
+ self.available = valid_framework?
+ if self.available_changed?
+ if self.available
+ logger.warn "provider #{name} is now available"
+ save!
+ else
+ logger.warn "provider #{name} is not available"
+ update_attribute(:available, false)
+ end
+ end
# if the provider is not running, mark as unavailable and don't refresh its
# realms
- unless valid_framework?
- update_attribute(:available, false)
- logger.warn "provider #{name} is not available"
- return
- end
+ return unless self.available
conductor_acct_realms = {}
conductor_acct_realm_ids = {}
diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb
index e8a8889..de6092d 100644
--- a/src/spec/factories/provider.rb
+++ b/src/spec/factories/provider.rb
@@ -61,4 +61,8 @@ FactoryGirl.define do
name "mock"
after_create { |p| p.provider_accounts << FactoryGirl.create(:mock_provider_account, :provider => p) }
end
+
+ factory :unavailable_mock_provider, :parent => :mock_provider do
+ available false
+ end
end
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 66b1365..8af85b1 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -216,10 +216,14 @@ describe Instance do
it "shouldn't match frontend realms mapped to unavailable providers" do
build = @instance.image_build || @instance.image.latest_pushed_build
- provider = FactoryGirl.create(:mock_provider, :name => build.provider_images.first.provider_name, :available => false)
+ provider = FactoryGirl.create(:mock_provider, :name => build.provider_images.first.provider_name)
realm_target = FactoryGirl.create(:realm_backend_target, :realm_or_provider => provider)
@instance.frontend_realm = realm_target.frontend_realm
@pool.pool_family.provider_accounts = [FactoryGirl.create(:mock_provider_account, :label => 'testaccount', :provider => provider)]
+ # provider's available flag can be changed when a provider account is
+ # created (populate_realms is called from after_create callback)
+ provider.available = false
+ provider.save!
@instance.matches.last.should include(I18n.t('instances.errors.provider_not_available', :account_name => 'testaccount'))
end
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index ca6843e..11cf71e 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
@@ -148,6 +148,23 @@ describe Provider do
it "should return empty list of not terminated instances when disabled" do
@provider.disable(nil)[:failed_to_terminate].should be_empty
end
+
+ it "should mark provider as unavailable if inaccessible" do
+ @provider.available.should be_true
+ @provider.populate_realms
+ @provider.available.should be_false
+ end
+ end
+
+ context "(unavailable provider)" do
+ before(:each) do
+ @provider = FactoryGirl.create(:unavailable_mock_provider)
+ end
+
+ it "should mark provider as available if it becomes accessible" do
+ @provider.populate_realms
+ @provider.available.should be_true
+ end
end
end
--
1.7.7.6
12 years, 2 months
[PATCH conductor] BZ 788558 - allow terminate inaccessible instances on 'stop' action
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
Theis patch allows locally stopping of instances or deployments if
the instance's/deployment's provider is not accessible.
It fixes a bug in passing user param to queue_action method, also simplifies
used error messages - only (stop|reboot)_invalid_action can be raised.
- this patch doesn't cover deletion of deployments which are not accessible - this is difficult
because there is a before_destroy hook on deployment which tries to destroy instances
on provider side.
- instances in folowong states are stopped locally:
STATE_NEW, STATE_PENDING, STATE_RUNNING, STATE_SHUTTING_DOWN
I think it makes sense to include STATE_SHUTTING_DOWN too. But this is not
consistent w/ termination when disabling provider when only
STATE_NEW, STATE_PENDING, STATE_RUNNING are stopped.
Not sure what is better, any suggestions are welcomed.
---
src/app/controllers/deployments_controller.rb | 43 +++++++++++-----
src/app/controllers/instances_controller.rb | 52 ++++++++++----------
src/app/models/deployment.rb | 17 ++++++
src/app/models/instance.rb | 35 +++++++++++---
.../views/deployments/confirm_terminate.html.haml | 16 ++++++
.../views/instances/confirm_terminate.html.haml | 16 ++++++
src/config/locales/cs.yml | 1 -
src/config/locales/en.yml | 11 +++--
src/features/deployment.feature | 12 +++++
src/features/instance.feature | 11 ++++
src/features/step_definitions/deployment_steps.rb | 7 +++
src/features/step_definitions/instance_steps.rb | 8 +++
12 files changed, 177 insertions(+), 52 deletions(-)
create mode 100644 src/app/views/deployments/confirm_terminate.html.haml
create mode 100644 src/app/views/instances/confirm_terminate.html.haml
diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb
index 588e88e..15050fc 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -18,6 +18,7 @@ class DeploymentsController < ApplicationController
before_filter :require_user
before_filter :load_deployments, :only => [:index, :show]
before_filter :load_deployment, :only => [:edit, :update]
+ before_filter :check_inaccessible_instances, :only => :multi_stop
viewstate :show do |default|
@@ -267,6 +268,7 @@ class DeploymentsController < ApplicationController
def multi_destroy
destroyed = []
failed = []
+
Deployment.find(params[:deployments_selected] || []).each do |deployment|
if check_privilege(Privilege::MODIFY, deployment)
begin
@@ -296,28 +298,28 @@ class DeploymentsController < ApplicationController
def multi_stop
notices = []
errors = []
- Deployment.find(params[:deployments_selected] || []).each do |deployment|
+
+ @deployments_to_stop.each do |deployment|
deployment.instances.each do |instance|
+ log_prefix = "#{t('deployments.deployment')}: #{instance.deployment.name}, #{t('instances.instance')}: #{instance.name}"
begin
- require_privilege(Privilege::USE,instance)
- unless instance.valid_action?('stop')
- raise ActionError.new(t('deployments.errors.stop_invalid_action'))
- end
-
- #permissons check here
- @task = instance.queue_action(current_user, 'stop')
- unless @task
- raise ActionError.new(t('deployments.errors.cannot_stop'))
+ require_privilege(Privilege::USE, instance)
+ if @inaccessible_instances.include?(instance)
+ instance.force_stop(current_user)
+ notices << "#{log_prefix}: #{t('instances.flash.notice.forced_stop')}"
+ else
+ instance.stop(current_user)
+ notices << "#{log_prefix}: #{t('instances.flash.notice.stop')}"
end
- Taskomatic.stop_instance(@task)
- notices << "#{t('deployments.deployment')}: #{instance.deployment.name}, #{t('instances.instance')}: #{instance.name}: #{t('deployments.flash.notice.stop')}"
rescue Exception => err
- errors << "#{t('deployments.deployment')}: #{instance.deployment.name}, #{t('instances.instance')}: #{instance.name}: " + err
+ errors << "#{log_prefix}: #{err}"
+ logger.error err.message
+ logger.error err.backtrace.join("\n ")
end
end
end
# If nothing is selected, display an error message:
- errors = t('deployments.flash.error.none_selected') if errors.blank? && notices.blank?
+ errors = t('deployments.flash.error.none_selected') if notices.blank? and errors.blank?
flash[:notice] = notices unless notices.blank?
flash[:error] = errors unless errors.blank?
respond_to do |format|
@@ -350,6 +352,19 @@ class DeploymentsController < ApplicationController
private
+ def check_inaccessible_instances
+ @deployments_to_stop = Deployment.find(params[:deployments_selected] || [])
+ @inaccessible_instances = Deployment.stoppable_inaccessible_instances(@deployments_to_stop)
+ if params[:terminate].blank? and @inaccessible_instances.any?
+ respond_to do |format|
+ format.html { render :action => :confirm_terminate }
+ format.json { render :json => {:inaccessbile_instances => @inaccessible_instances}, :status => :unprocessable_entity }
+ end
+ return false
+ end
+ return true
+ end
+
def load_deployments
@deployments_header = [
{ :name => 'checkbox', :class => 'checkbox', :sortable => false },
diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index a44e7be..987ff9f 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -18,6 +18,7 @@ class InstancesController < ApplicationController
before_filter :require_user
before_filter :load_instance, :only => [:show, :key, :edit, :update]
before_filter :set_view_vars, :only => [:show, :index, :export_events]
+ before_filter :check_inaccessible_instances, :only => :multi_stop
def index
@params = params
@@ -139,27 +140,26 @@ class InstancesController < ApplicationController
end
def multi_stop
- notices = ""
- errors = ""
- Instance.find(params[:instance_selected] || []).each do |instance|
+ notices = []
+ errors = []
+
+ @instances_to_stop.each do |instance|
begin
require_privilege(Privilege::USE,instance)
- unless instance.valid_action?('stop')
- raise ActionError.new(t('instances.errors.stop_invalid'))
- end
- #permissons check here
- @task = instance.queue_action(current_user, 'stop')
- unless @task
- raise ActionError.new(t('instances.errors.stop_not_be_performed'))
+ if @inaccessible_instances.include?(instance)
+ instance.force_stop(current_user)
+ notices << "#{instance.name}: #{t('instances.flash.notice.forced_stop')}"
+ else
+ instance.stop(current_user)
+ notices << "#{instance.name}: #{t('instances.flash.notice.stop')}"
end
- Taskomatic.stop_instance(@task)
- notices << "#{instance.name}: #{t('instances.flash.notice.stop')}"
rescue Exception => err
errors << "#{instance.name}: " + err
+ logger.error err.message
+ logger.error err.backtrace.join("\n ")
end
end
- # If nothing is selected, display an error message:
errors = t('instances.none_selected') if errors.blank? && notices.blank?
flash[:notice] = notices unless notices.blank?
flash[:error] = errors unless errors.blank?
@@ -176,11 +176,11 @@ class InstancesController < ApplicationController
end
def stop
- do_operation(:stop)
+ do_operation(current_user, :stop)
end
def reboot
- do_operation(:reboot)
+ do_operation(current_user, :reboot)
end
def multi_reboot
@@ -189,7 +189,7 @@ class InstancesController < ApplicationController
Instance.find(params[:instance_selected] || []).each do |instance|
begin
require_privilege(Privilege::USE,instance)
- instance.reboot
+ instance.reboot(current_user)
notices << "#{instance.name}: #{t('instances.flash.notice.reboot', :name => instance.name)}"
rescue Exception => err
errors << "#{instance.name}: " + err
@@ -250,16 +250,16 @@ class InstancesController < ApplicationController
end
end
- def do_operation(operation)
- instance = Instance.find(params[:id])
- begin
- instance.send(operation)
- flash[:notice] = t("instances.flash.notice.#{operation}", :name => instance.name)
- rescue Exception => err
- flash[:error] = t('instance.error', :name => instance.name, :err => err)
- end
- respond_to do |format|
- format.html { redirect_to deployment_path(instance.deployment, :details_tab => 'instances')}
+ def check_inaccessible_instances
+ @instances_to_stop = Instance.find(params[:instance_selected] || [])
+ @inaccessible_instances = Instance.stoppable_inaccessible_instances(@instances_to_stop)
+ if params[:terminate].blank? and @inaccessible_instances.any?
+ respond_to do |format|
+ format.html { render :action => :confirm_terminate }
+ format.json { render :json => {:inaccessbile_instances => @inaccessible_instances}, :status => :unprocessable_entity }
+ end
+ return false
end
+ return true
end
end
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 9593645..880afdd 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -171,6 +171,18 @@ class Deployment < ActiveRecord::Base
end
end
+ def self.stoppable_inaccessible_instances(deployments)
+ failed_accounts = {}
+ res = []
+ deployments.each do |d|
+ next unless acc = d.provider_account
+ failed_accounts[acc.id] = acc.connect.nil? unless failed_accounts.has_key?(acc.id)
+ next unless failed_accounts[acc.id]
+ res += d.instances.stoppable_inaccessible
+ end
+ res
+ end
+
def launch_parameters
@launch_parameters ||= {}
end
@@ -329,6 +341,11 @@ class Deployment < ActiveRecord::Base
inst && inst.provider_account && inst.provider_account.provider
end
+ def provider_account
+ inst = instances.joins(:provider_account).first
+ inst && inst.provider_account
+ end
+
# we try to create an instance for each assembly and check
# if a match is found
def check_assemblies_matches(user)
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index c2a1d04..f96784d 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -114,6 +114,8 @@ class Instance < ActiveRecord::Base
STATE_SHUTTING_DOWN, STATE_STOPPED, STATE_CREATE_FAILED,
STATE_ERROR, STATE_VANISHED]
+ STOPPABLE_INACCESSIBLE_STATES = [STATE_NEW, STATE_PENDING, STATE_RUNNING, STATE_SHUTTING_DOWN]
+
scope :deployed, :conditions => { :state => [STATE_RUNNING, STATE_SHUTTING_DOWN] }
# FIXME: "pending" is misleading as it doesn't just cover STATE_PENDING
scope :pending, :conditions => { :state => [STATE_NEW, STATE_PENDING] }
@@ -122,6 +124,7 @@ class Instance < ActiveRecord::Base
scope :stopped, :conditions => {:state => STATE_STOPPED}
scope :not_stopped, :conditions => "state <> 'stopped'"
scope :stopable, :conditions => { :state => [STATE_NEW, STATE_PENDING, STATE_RUNNING] }
+ scope :stoppable_inaccessible, :conditions => { :state => STOPPABLE_INACCESSIBLE_STATES }
scope :ascending_by_name, :order => 'instances.name ASC'
@@ -434,12 +437,20 @@ class Instance < ActiveRecord::Base
not deployment.instances.deployed.any? {|i| i != self}
end
- def stop
- do_operation('stop')
+ def stop(user)
+ do_operation(user, 'stop')
+ end
+
+ def reboot(user)
+ do_operation(user, 'reboot')
end
- def reboot
- do_operation('reboot')
+ def force_stop(user)
+ self.state = STATE_STOPPED
+ save!
+ event = Event.create!(:source => self, :event_time => Time.now,
+ :summary => "Instance is not accessible, state changed to stopped",
+ :status_code => "force_stop")
end
def deployed?
@@ -477,6 +488,16 @@ class Instance < ActiveRecord::Base
end
end
+ def self.stoppable_inaccessible_instances(instances)
+ failed_accounts = {}
+ instances.select do |i|
+ next unless STOPPABLE_INACCESSIBLE_STATES.include?(i.state)
+ next unless i.provider_account
+ failed_accounts[i.provider_account.id] = i.provider_account.connect.nil? unless failed_accounts.has_key?(i.provider_account.id)
+ failed_accounts[i.provider_account.id]
+ end
+ end
+
private
def self.apply_search_filter(search)
@@ -495,10 +516,10 @@ class Instance < ActiveRecord::Base
self[:uuid] = UUIDTools::UUID.timestamp_create.to_s
end
- def do_operation(operation)
- @task = self.queue_action(@current_user, operation)
+ def do_operation(user, operation)
+ @task = self.queue_action(user, operation)
unless @task
- raise I18n.t("instances.errors.#{operation}_not_be_performed")
+ raise I18n.t("instances.errors.#{operation}_invalid_action")
end
Taskomatic.send("#{operation}_instance", @task)
end
diff --git a/src/app/views/deployments/confirm_terminate.html.haml b/src/app/views/deployments/confirm_terminate.html.haml
new file mode 100644
index 0000000..8e03326
--- /dev/null
+++ b/src/app/views/deployments/confirm_terminate.html.haml
@@ -0,0 +1,16 @@
+%header.page-header
+ %h1{:class => controller.controller_name}= t "instances.confirm_terminate.terminate_instances"
+ .corner
+
+%section.content-section
+ .content.instance_details
+ .align-center
+ %strong= t('instances.confirm_terminate.terminate_instances_description')
+ = form_tag multi_stop_deployments_path, :method => :post do
+ - @deployments_to_stop.each do |i|
+ = hidden_field_tag 'deployments_selected[]', i.id
+ %ul
+ - @inaccessible_instances.each do |i|
+ %li= i.name
+ = link_to t('cancel'), pools_path(:view => 'filter', :details_tab => 'deployments'), :class => 'button'
+ = submit_tag t('instances.confirm_terminate.terminate'), :name => 'terminate', :class => 'button', :id => 'terminate_button'
diff --git a/src/app/views/instances/confirm_terminate.html.haml b/src/app/views/instances/confirm_terminate.html.haml
new file mode 100644
index 0000000..ded19dd
--- /dev/null
+++ b/src/app/views/instances/confirm_terminate.html.haml
@@ -0,0 +1,16 @@
+%header.page-header
+ %h1{:class => controller.controller_name}= t ".terminate_instances"
+ .corner
+
+%section.content-section
+ .content.instance_details
+ .align-center
+ %strong= t('.terminate_instances_description')
+ = form_tag multi_stop_instances_path, :method => :post do
+ - @instances_to_stop.each do |i|
+ = hidden_field_tag 'instance_selected[]', i.id
+ %ul
+ - @inaccessible_instances.each do |i|
+ %li= i.name
+ = link_to t('cancel'), pools_path(:view => 'filter', :details_tab => 'instances'), :class => 'button'
+ = submit_tag t('.terminate'), :name => 'terminate', :class => 'button', :id => 'terminate_button'
diff --git a/src/config/locales/cs.yml b/src/config/locales/cs.yml
index 7ada0cc..6b0f7b4 100644
--- a/src/config/locales/cs.yml
+++ b/src/config/locales/cs.yml
@@ -476,7 +476,6 @@ cs:
invalid_state: okhbeh kigib bog mhknokdmj klonm kcolb ndjhmhk neafi
no_config_server_available: "%{account_name}: ae hmenoo lidmgk mboinakkm boc cnfcjbli abicnag"
user_quota_reached: kone bdgjo kbggdbl
- stop_not_be_performed: cdim lfnggh nk ogldenhne gk mhde makmngjfl
provider_account_quota_too_low: "%{match_provider_account} ifcjl omcdh lkm dke gi gkcomo efehjbfgnl"
provider_account_quota_reached: "%{account_name}: boefladm ebbjhmd caidj klmghik"
image_not_pushed_to_provider: "%{account_name}: ofeif km fef minkbc gc bcei gncmokeo hgeickk"
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index addb68e..fd228de 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -279,7 +279,6 @@ en:
other: "The deployments %{list} were successfully updated."
errors:
config_server_connection: 'Cannot connect to the config server'
- stop_invalid_action: "stop is an invalid action."
cannot_stop: "stop cannot be performed on this instance."
all_stopped: "All instances must be stopped or running"
not_valid_deployable_xml: "seems to be not valid deployable XML: %{msg}"
@@ -343,6 +342,10 @@ en:
shared_to: "Shared to: "
error: "Error: "
n_a: "N/A"
+ confirm_terminate:
+ terminate: "Terminate"
+ terminate_instances: "Terminate Instances"
+ terminate_instances_description: "Provider is not accessible, status of following instances will be changed to 'stopped' but their actual state is unknown."
flash:
warning:
ssh_key_not_found: "SSH Key not found for this Instance."
@@ -363,6 +366,7 @@ en:
other: "The instances %{list} were successfully deleted."
notice:
stop: "stop action was successfully queued."
+ forced_stop: "state changed to stopped."
reboot: "%{name}: reboot action was successfully queued."
errors:
image_not_found: "No image build was found with uuid %{b_uuid} and no image was found with uuid %{i_uuid}"
@@ -378,9 +382,8 @@ en:
no_config_server_available: "%{account_name}: no config server available for provider account"
realm_not_mapped: "%{account_name}: realm %{frontend_realm_name} is not mapped to any applicable provider or provider realm"
provider_account_quota_too_low: "%{match_provider_account} quota limit too low to launch deployable"
- stop_invalid: "stop is an invalid action."
- stop_not_be_performed: "stop cannot be performed on this instance."
- reboot_not_be_performed: "cannot be rebooted because it's not currently running."
+ stop_invalid_action: "stop is an invalid action."
+ reboot_invalid_action: "reboot is an invalid action."
must_be_enabled: "%{account_name}: provider must be enabled"
provider_not_available: "%{account_name}: provider is not available"
cannot_destroy: "destroy cannot be performed on this instance."
diff --git a/src/features/deployment.feature b/src/features/deployment.feature
index 7b6a663..b9e195e 100644
--- a/src/features/deployment.feature
+++ b/src/features/deployment.feature
@@ -82,6 +82,18 @@ Feature: Manage Deployments
And I press "stop_button"
Then I should see "testdeployment"
+ Scenario: Stop inaccessible deployments
+ Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser"
+ And "testdeployment" deployment's provider is not accessible
+ When I go to the deployments page
+ Then I should see "testdeployment"
+ When I check "testdeployment" deployment
+ And I press "stop_button"
+ Then I should see "Terminate Instances"
+ When I press "terminate_button"
+ Then I should see "state changed to stopped"
+
+
Scenario: Stop a deployment over XHR
Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser"
And I request XHR
diff --git a/src/features/instance.feature b/src/features/instance.feature
index 1d91333..446ee53 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -71,6 +71,17 @@ Feature: Manage Instances
Then I should be on the instances page
And I should see "mock1: stop action was successfully queued"
+ Scenario: Stop inaccessible instance
+ Given there is a "mock1" running instance
+ And I am on the instances page
+ And "mock1" instance's provider is not accessible
+ When I check "mock1" instance
+ And I press "stop_selected_instances"
+ Then I should see "Terminate Instances"
+ And I should see "mock1"
+ When I press "terminate_button"
+ Then I should see "mock1: state changed to stopped"
+
Scenario: Stop multiple instances
Given there is a "mock1" running instance
And there is a "mock2" running instance
diff --git a/src/features/step_definitions/deployment_steps.rb b/src/features/step_definitions/deployment_steps.rb
index 5eedc1d..0640d9d 100644
--- a/src/features/step_definitions/deployment_steps.rb
+++ b/src/features/step_definitions/deployment_steps.rb
@@ -38,6 +38,13 @@ Given /^the deployment "([^"]*)" has an instance named "([^"]*)"$/ do |d_name, i
deployment.instances << FactoryGirl.create(:instance, :name => i_name, :pool => deployment.pool)
end
+Given /^"([^"]*)" deployment's provider is not accessible$/ do |arg1|
+ # FIXME: didn't find a way how to create an inaccessible provider
+ # cleanly
+ provider = @deployment.provider
+ provider.update_attribute(:url, 'http://localhost:3002/invalid_api')
+end
+
When /^I am viewing the deployment "([^"]*)"$/ do |arg1|
visit deployment_url(Deployment.find_by_name(arg1))
end
diff --git a/src/features/step_definitions/instance_steps.rb b/src/features/step_definitions/instance_steps.rb
index 268fcdb..5f4d3bb 100644
--- a/src/features/step_definitions/instance_steps.rb
+++ b/src/features/step_definitions/instance_steps.rb
@@ -39,6 +39,14 @@ Given /^the instance "([^"]*)" is in the (\w*) state$/ do |instance, state|
instance.save!
end
+Given /^"([^"]*)" instance's provider is not accessible$/ do |arg1|
+ instance = Instance.find_by_name(arg1)
+ # FIXME: didn't find a way how to create an inaccessible provider
+ # cleanly
+ provider = instance.provider_account.provider
+ provider.update_attribute(:url, 'http://localhost:3002/invalid_api')
+end
+
When /^I am viewing the pending instance detail$/ do
visit instance_url(pending_instance)
end
--
1.7.7.6
12 years, 2 months
