[PATCH Conductor] As a developer, I want to define useful uptime reporting and display times
Patch contains implementation of counting uptime for deployments in these case: - uptime of deployment when 1st instance is running - uptime of deployment when all instances are running, but when one of instance fail, we'll stop counting.
For Ken: Could you check if my change in layout.scss is ok?
From: Jozef Zigmund jzigmund@redhat.com
--- src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 28 +++++++++++++++----------- src/app/models/deployment.rb | 23 ++++++++++++++++++++++ src/app/models/instance.rb | 12 ++++++++++- src/app/models/instance_observer.rb | 12 +++++++++++ src/app/stylesheets/layout.scss | 2 +- src/app/views/pools/_deployments.haml | 8 ++++++- src/spec/helpers/application_helper_spec.rb | 8 +++++++ src/spec/models/deployment_spec.rb | 6 +++++ src/spec/models/instance_observer_spec.rb | 11 ++++++++++ src/spec/models/instance_spec.rb | 24 +++++++++++++++++++++++ 11 files changed, 121 insertions(+), 16 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr' - #gem 'webmock' #gem 'launchy' + #gem 'ruby-debug' + #gem 'webmock' end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 55de326..b8ce8c8 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -216,20 +216,24 @@ module ApplicationHelper end
def count_uptime(start_time) - result_string = [] - difference = Time.now.utc - start_time + if start_time + result_string = [] + difference = Time.now.utc - start_time
- seconds = difference % 60 - difference = (difference - seconds) / 60 - minutes = difference % 60 - difference = (difference - minutes) / 60 - hours = difference % 24 - difference = (difference - hours) / 24 - days = difference % 7 + seconds = difference % 60 + difference = (difference - seconds) / 60 + minutes = difference % 60 + difference = (difference - minutes) / 60 + hours = difference % 24 + difference = (difference - hours) / 24 + days = difference % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0 - result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" - result_string.join(", ") + result_string<< pluralize(days.to_i, 'day') if days != 0 + result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" + result_string.join(", ") + else + "N/A" + end end
def owner_name(obj) diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..68f2a18 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id" + + has_many :events, :as => :source, :dependent => :destroy + after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id @@ -243,4 +246,24 @@ class Deployment < ActiveRecord::Base end errs end + + def uptime_1st_instance + if events.empty? + nil + else + events.find_by_summary("1st instance running").event_time + end + end + + def uptime_all + Rails.logger.info("#{events.inspect}\nLAST => #{events.last.inspect}") + if events.empty? + nil + else + events.last.event_time if events.last.summary == "All instances running" + end + #unless events.last.nil? + # events.last.summary == "All instances running" ? events.last.event_time : nil + #end + end end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..dd6af41 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,19 @@ class Instance < ActiveRecord::Base }) end
+ def first_running? + deployment.instances.reject {|i| i == self}.each {|instance| return false if instance.state == Instance::STATE_RUNNING } + true + end + + def all_running? + deployment.instances.each{|instance| return false if instance.state != Instance::STATE_RUNNING} + true + end + private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_') - end + end end diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..93b2a4c 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,18 @@ class InstanceObserver < ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save! + if instance.state == Instance::STATE_RUNNING && instance.deployment + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :summary => "1st instance running") if instance.first_running? + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :summary => "All instances running") if instance.all_running? + event2.save! if event2 + elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_SHUTTING_DOWN || instance.state == Instance::STATE_ERROR) && instance.deployment + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :summary => "Instance not running") + event3.save! if event3 + end + end end
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index af41d65..7fdab64 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -2191,7 +2191,7 @@ ul.deployment-array.large + ul.deployment-array.large{ /********************************************* Small Deployable Card Arrays */ /************************************************************************** */
-$deployment-small-height: 84px; +$deployment-small-height: 110px; /*change it from 84px, because of uptimes displaying*/ $deployment-small-width: 174px; $deployment-small-padding: 8px;
diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment) + Global uptime + = count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances - %dd= deployment.instances.count || 0 \ No newline at end of file + %dd= deployment.instances.count || 0 + + %li.left + %dt Uptime + %dd= count_uptime(deployment.uptime_1st_instance) \ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..a3f8be4 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
+ it "count_uptime should return right values" do + count_uptime(Time.now-10).should be_true + end + + it "count_uptime should return N/A if nil is passed as parameter" do + count_uptime(nil).should == "N/A" + end + end
end diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..fb90184 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,10 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end + + it "should be return nil if deployment has no events " do + deployment = Factory :deployment + deployment.uptime_1st_instance.should be_nil + deployment.uptime_all.should be_nil + end end diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..ae95440 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -199,4 +199,15 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end + + it "should create event when one of deployment's instance stop/fail'" do + deployment = Factory :deployment + instance1 = Factory :mock_running_instance, :deployment => deployment + instance2 = Factory :mock_running_instance, :deployment => deployment + instance3 = Factory :mock_running_instance, :deployment => deployment + instance2.state = Instance::STATE_ERROR + instance2.save! + deployment.events.last.summary.should == "Instance not running" + end + end diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..4e41d50 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -210,5 +210,29 @@ describe Instance do export_string.include?(instance.id.to_s).should be_true export_string.include?("Instance").should be_true export_string.include?("created").should be_true + + context "When more instances of deployment are starting" do + it "should return true if first instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance1.state = Instance::STATE_RUNNING + deployment.stub(:instances){[instance1, instance2, instance3]} + instance1.first_running?.should be_true + instance2.state = Instance::STATE_RUNNING + instance1.first_running?.should be_false + end + + it "should return true if first instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_running_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance1, instance3, instance2]} + instance1.all_running?.should be_false + instance3.state = Instance::STATE_RUNNING + instance1.all_running?.should be_true + end end end
Hi Jozef, sending some feedback (inline).
Jan
On 08/25/2011 05:40 PM, jzigmund@redhat.com wrote:
From: Jozef Zigmundjzigmund@redhat.com
could you please add some short basic description to this commit
src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 28 +++++++++++++++----------- src/app/models/deployment.rb | 23 ++++++++++++++++++++++ src/app/models/instance.rb | 12 ++++++++++- src/app/models/instance_observer.rb | 12 +++++++++++ src/app/stylesheets/layout.scss | 2 +- src/app/views/pools/_deployments.haml | 8 ++++++- src/spec/helpers/application_helper_spec.rb | 8 +++++++ src/spec/models/deployment_spec.rb | 6 +++++ src/spec/models/instance_observer_spec.rb | 11 ++++++++++ src/spec/models/instance_spec.rb | 24 +++++++++++++++++++++++ 11 files changed, 121 insertions(+), 16 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr'
- #gem 'webmock' #gem 'launchy'
- #gem 'ruby-debug'
- #gem 'webmock' end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 55de326..b8ce8c8 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -216,20 +216,24 @@ module ApplicationHelper end
def count_uptime(start_time)
- result_string = []
- difference = Time.now.utc - start_time
- if start_time
result_string = []difference = Time.now.utc - start_time
- seconds = difference % 60
- difference = (difference - seconds) / 60
- minutes = difference % 60
- difference = (difference - minutes) / 60
- hours = difference % 24
- difference = (difference - hours) / 24
- days = difference % 7
seconds = difference % 60difference = (difference - seconds) / 60minutes = difference % 60difference = (difference - minutes) / 60hours = difference % 24difference = (difference - hours) / 24days = difference % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0
- result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"
- result_string.join(", ")
result_string<< pluralize(days.to_i, 'day') if days != 0result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"result_string.join(", ")else
"N/A"end end
def owner_name(obj)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..68f2a18 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment< ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id"
has_many :events, :as => :source, :dependent => :destroy
after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id
@@ -243,4 +246,24 @@ class Deployment< ActiveRecord::Base end errs end
- def uptime_1st_instance
'1st_...' could be replaced with 'any_...' on all places (suggested in 'Define useful uptimes' thread)
- if events.empty?
nil- else
events.find_by_summary("1st instance running").event_time- end
No need to use if-else: find_by returns nil if record is not found
Also I think it would be better not use finding by message (search for text "1st instance running". Using "status_code" field which is defined on Event model seems to be better to me, so there will be status codes: any_running, all_running
- end
- def uptime_all
- Rails.logger.info("#{events.inspect}\nLAST => #{events.last.inspect}")
^ looks like forgotten debug line
- if events.empty?
nil- else
events.last.event_time if events.last.summary == "All instances running"- end
- #unless events.last.nil?
- # events.last.summary == "All instances running" ? events.last.event_time : nil
- #end
same as above - only find_by can be used, commented code can be removed
- end end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..dd6af41 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,19 @@ class Instance< ActiveRecord::Base }) end
- def first_running?
- deployment.instances.reject {|i| i == self}.each {|instance| return false if instance.state == Instance::STATE_RUNNING }
you could simplify this by using scope 'deployed' & find: deployment.instances.deployed.find {|i| i != self} ? true : false
- true
- end
- def all_running?
- deployment.instances.each{|instance| return false if instance.state != Instance::STATE_RUNNING}
- true
- end
Both methods above should be part of Deployment model.
private def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9\.\-]/, '_')
- end
- end end
diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..93b2a4c 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,18 @@ class InstanceObserver< ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save!
if instance.state == Instance::STATE_RUNNING&& instance.deploymentevent2 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:summary => "1st instance running") if instance.first_running?event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:summary => "All instances running") if instance.all_running?
event2.save! if event2
if there is be only one instance in deployment, then first_running is not logged, I think both states should be logged even for single instance deployments.
elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_SHUTTING_DOWN || instance.state == Instance::STATE_ERROR)&& instance.deploymentevent3 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:summary => "Instance not running")
this will log "instance not running" anytime state is changed even in inactive states (new -> create_failed, shutting_down -> error,...)
you can simplify by: elsif (instance.state_changed? and instance.state_was == 'running')
event3.save! if event3endenddiff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index af41d65..7fdab64 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -2191,7 +2191,7 @@ ul.deployment-array.large + ul.deployment-array.large{ /********************************************* Small Deployable Card Arrays */ /************************************************************************** */
-$deployment-small-height: 84px; +$deployment-small-height: 110px; /*change it from 84px, because of uptimes displaying*/ $deployment-small-width: 174px; $deployment-small-padding: 8px;
diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment)
Global uptime= count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances
%dd= deployment.instances.count || 0\ No newline at end of file
%dd= deployment.instances.count || 0%li.left%dt Uptime%dd= count_uptime(deployment.uptime_1st_instance)
^ this uptime displays Time.now - time when first instance was started. Another problem is that uptime is displayed only for running deployments, so a user has no chance to check how long a stopped deployment was running. Not sure if view was already discussed with Ken, but for first iteration I would expect: global uptime: (first stopped instance || Time.now) - all_running_instance uptime: (all stopped instances || Time now) - first_running_instance
Uptime should be also displayed for single instances.
\ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..a3f8be4 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
it "count_uptime should return right values" do
count_uptime(Time.now-10).should be_trueend
it "count_uptime should return N/A if nil is passed as parameter" do
count_uptime(nil).should == "N/A"end
end
end
diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..fb90184 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,10 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end
- it "should be return nil if deployment has no events " do
- deployment = Factory :deployment
- deployment.uptime_1st_instance.should be_nil
- deployment.uptime_all.should be_nil
- end end
diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..ae95440 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -199,4 +199,15 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end
- it "should create event when one of deployment's instance stop/fail'" do
- deployment = Factory :deployment
- instance1 = Factory :mock_running_instance, :deployment => deployment
- instance2 = Factory :mock_running_instance, :deployment => deployment
- instance3 = Factory :mock_running_instance, :deployment => deployment
- instance2.state = Instance::STATE_ERROR
- instance2.save!
- deployment.events.last.summary.should == "Instance not running"
- end
- end
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..4e41d50 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -210,5 +210,29 @@ describe Instance do export_string.include?(instance.id.to_s).should be_true export_string.include?("Instance").should be_true export_string.include?("created").should be_true
- context "When more instances of deployment are starting" do
- it "should return true if first instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment => deployment)instance2 = Factory.build(:mock_pending_instance, :deployment => deployment)instance3 = Factory.build(:mock_pending_instance, :deployment => deployment)instance1.state = Instance::STATE_RUNNINGdeployment.stub(:instances){[instance1, instance2, instance3]}instance1.first_running?.should be_trueinstance2.state = Instance::STATE_RUNNINGinstance1.first_running?.should be_false- end
- it "should return true if first instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment => deployment)instance2 = Factory.build(:mock_running_instance, :deployment => deployment)instance3 = Factory.build(:mock_pending_instance, :deployment => deployment)deployment.stub(:instances){[instance1, instance3, instance2]}instance1.all_running?.should be_falseinstance3.state = Instance::STATE_RUNNINGinstance1.all_running?.should be_true- end end end
From: Jozef Zigmund jzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes: - 1st instance running - when 1st instance of deployment is running(start point of counting uptime) - all instances runinng - when all instances of deployment are running(start point of counting global uptime) - any instances running - when one of running instances is stopped/failed(end point of counting global uptime) - all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime) --- src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 ++++++++++-------- src/app/models/deployment.rb | 42 +++++++++++++++++++++++++++ src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 17 +++++++++++ src/app/stylesheets/layout.scss | 2 +- src/app/views/pools/_deployments.haml | 8 ++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 ++++++++++ src/spec/models/instance_observer_spec.rb | 15 +++++++++- src/spec/models/instance_spec.rb | 24 +++++++++++++++ 11 files changed, 152 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr' - #gem 'webmock' #gem 'launchy' + #gem 'ruby-debug' + #gem 'webmock' end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time) - result_string = [] - difference = Time.now.utc - start_time + def count_uptime(time) + if time + result_string = []
- seconds = difference % 60 - difference = (difference - seconds) / 60 - minutes = difference % 60 - difference = (difference - minutes) / 60 - hours = difference % 24 - difference = (difference - hours) / 24 - days = difference % 7 + seconds = time % 60 + time = (time - seconds) / 60 + minutes = time % 60 + time = (time - minutes) / 60 + hours = time % 24 + time = (time - hours) / 24 + days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0 - result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" - result_string.join(", ") + result_string<< pluralize(days.to_i, 'day') if days != 0 + result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" + result_string.join(", ") + else + "N/A" + end end
def owner_name(obj) diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..256d804 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id" + + has_many :events, :as => :source, :dependent => :destroy + after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id @@ -243,4 +246,43 @@ class Deployment < ActiveRecord::Base end errs end + + def all_instances_running? + instances.each{|instance| return false if instance.state != (Instance::STATE_RUNNING || Instance::STATE_SHUTTING_DOWN)} + true + end + + def any_instance_running? + instances.detect {|i| i.state == Instance::STATE_RUNNING } ? true : false + end + + def uptime_1st_instance + unless events.empty? + unless instances.deployed.empty? + if instances.count > 1 && events.find_by_status_code("1st instance running") + Time.now.utc - events.find_by_status_code("1st instance running").event_time + elsif events.find_by_status_code("All instances running") + Time.now.utc - events.find_by_status_code("All instances running").event_time + end + else + if instances.count > 1 && events.find_by_status_code("All instances stopped") && events.find_by_status_code("1st instance running") + events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("1st instance running").event_time + elsif events.find_by_status_code("All instances stopped") && events.find_by_status_code("All instances running") + events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("All instances running").event_time + end + end + end + end + + def uptime_all + unless events.empty? + if instances.deployed.count == instances.count && events.last.status_code == "All instances running" + Time.now.utc - events.last.event_time + elsif instances.count > 1 && events.find_by_status_code("All instances running") && events.find_by_status_code("Any instances running") + events.find_by_status_code("Any instances running").event_time - events.find_by_status_code("All instances running").event_time + elsif events.find_by_status_code("All instances stopped") && events.find_by_status_code("All instances running") + events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("All instances running").event_time + end + end + end end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..52317f4 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance < ActiveRecord::Base }) end
+ def first_running? + (deployment.instances.detect {|i| i.state == Instance::STATE_RUNNING && i != self} ? false : true) if deployment + end + private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_') - end + end end diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a805743 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,23 @@ class InstanceObserver < ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save! + if instance.state == Instance::STATE_RUNNING && instance.deployment + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "1st instance running") if instance.first_running? + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "All instances running") if instance.deployment.all_instances_running? + event2.save! if event2 + elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_ERROR) && instance.deployment + if instance.deployment.any_instance_running? && !(instance.deployment.events.empty?) + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "Any instances running") unless instance.deployment.events.last.status_code == "Any instances running" + else + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "All instances stopped") + end + event3.save! if event3 + end + end end
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index af41d65..7fdab64 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -2191,7 +2191,7 @@ ul.deployment-array.large + ul.deployment-array.large{ /********************************************* Small Deployable Card Arrays */ /************************************************************************** */
-$deployment-small-height: 84px; +$deployment-small-height: 110px; /*change it from 84px, because of uptimes displaying*/ $deployment-small-width: 174px; $deployment-small-padding: 8px;
diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment) + Global uptime + = count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances - %dd= deployment.instances.count || 0 \ No newline at end of file + %dd= deployment.instances.count || 0 + + %li.left + %dt Uptime + %dd= count_uptime(deployment.uptime_1st_instance) \ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
+ it "count_uptime should return right values" do + count_uptime(Time.now-(Time.now-10)).should be_true + end + + it "count_uptime should return N/A if nil is passed as parameter" do + count_uptime(nil).should == "N/A" + end + end
end diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end + + it "should be return nil if deployment has no events " do + deployment = Factory :deployment + deployment.uptime_1st_instance.should be_nil + deployment.uptime_all.should be_nil + end + + it "should return false if no deployed instances" do + deployment = Factory.build :deployment + instance = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance, instance2]} + deployment.any_instance_running?.should be_true + instance.state = Instance::STATE_PENDING + deployment.any_instance_running?.should be_false + end end diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4f419f2 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN - @instance.save!; + @instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end + + it "should create event when one of deployment's instance stop/fail'" do + deployment = Factory :deployment + instance1 = Factory :mock_running_instance, :deployment => deployment + instance2 = Factory :mock_running_instance, :deployment => deployment + instance3 = Factory :mock_pending_instance, :deployment => deployment + instance3.state = Instance::STATE_RUNNING + instance3.save! + instance2.state = Instance::STATE_ERROR + instance2.save! + deployment.events.last.status_code.should == "Any instances running" + end + end diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..78d0c0f 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -211,4 +211,28 @@ describe Instance do export_string.include?("Instance").should be_true export_string.include?("created").should be_true end + + context "When more instances of deployment are starting" do + it "should return true if first instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance1, instance2, instance3]} + instance1.first_running?.should be_true + instance2.state = Instance::STATE_RUNNING + instance1.first_running?.should be_false + end + + it "should return true if all instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_running_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance1, instance3, instance2]} + deployment.all_instances_running?.should be_false + instance3.state = Instance::STATE_RUNNING + deployment.all_instances_running?.should be_true + end + end end
Hey Jozef,
Overall this looks good and does what it's supposed to, but there is a few issues.
Cucumber reports 3 failing scenarios:
cucumber features/pool.feature:140 # Scenario: View a pool over XHR cucumber features/pool.feature:176 # Scenario: Pools#show pretty view cucumber features/pool.feature:182 # Scenario: Pools#show filter view
Clicking on a pool results in an error. It seems that's what causes cucumbers to fail.
Next, please rename the event "Any instances running" to "Not all instances running" or maybe "Some instances stopped". The word "any" is used mainly in questions and negative statements.
Also, please put the English messages for events to event.summary. `event.status_code` should have short simple strings that could be easily converted to symbols. Like "instance_stopped", "state_changed", "all_running", etc.
You could have both. For example:
Event.new(:source => instance.deployment, :event_time => DateTime.now, :status_code => :all_started, :summary => "All instances were launched")
You could then do all the event filtering and comparison on the status code regardless of any changes or translation of the summary text.
More notes on the code inline.
Thomas
On 08/31/2011 01:15 AM, jzigmund@redhat.com wrote:
From: Jozef Zigmundjzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes:
- 1st instance running - when 1st instance of deployment is running(start point of counting uptime)
- all instances runinng - when all instances of deployment are running(start point of counting global uptime)
- any instances running - when one of running instances is stopped/failed(end point of counting global uptime)
- all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime)
src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 ++++++++++-------- src/app/models/deployment.rb | 42 +++++++++++++++++++++++++++ src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 17 +++++++++++ src/app/stylesheets/layout.scss | 2 +- src/app/views/pools/_deployments.haml | 8 ++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 ++++++++++ src/spec/models/instance_observer_spec.rb | 15 +++++++++- src/spec/models/instance_spec.rb | 24 +++++++++++++++ 11 files changed, 152 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr'
- #gem 'webmock' #gem 'launchy'
- #gem 'ruby-debug'
- #gem 'webmock' end
This ^ looks like forgotten debugging code. Please remove it.
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time)
- result_string = []
- difference = Time.now.utc - start_time
- def count_uptime(time)
- if time
result_string = []
- seconds = difference % 60
- difference = (difference - seconds) / 60
- minutes = difference % 60
- difference = (difference - minutes) / 60
- hours = difference % 24
- difference = (difference - hours) / 24
- days = difference % 7
seconds = time % 60time = (time - seconds) / 60minutes = time % 60time = (time - minutes) / 60hours = time % 24time = (time - hours) / 24days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0
- result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"
- result_string.join(", ")
result_string<< pluralize(days.to_i, 'day') if days != 0result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"result_string.join(", ")else
"N/A"end end
def owner_name(obj)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..256d804 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment< ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id"
- has_many :events, :as => :source, :dependent => :destroy
Events should not be `:dependent => :destroy`. We want to keep them around even after the source object that created is gone.
after_create "assign_owner_roles(owner)" validates_presence_of :pool_id@@ -243,4 +246,43 @@ class Deployment< ActiveRecord::Base end errs end
- def all_instances_running?
- instances.each{|instance| return false if instance.state != (Instance::STATE_RUNNING || Instance::STATE_SHUTTING_DOWN)}
This expression:
(Instance::STATE_RUNNING || Instance::STATE_SHUTTING_DOWN)
will always return `Instance::STATE_RUNNING`. So the `instance.state` will never be checked with STATE_SHUTTING_DOWN.
- true
- end
You can replace the entire body of that method ^ with this line:
instances.all? {|instance| [Instance::STATE_RUNNING, Instance::STATE_SHUTTING_DOWN].include? instance.state }
- def any_instance_running?
- instances.detect {|i| i.state == Instance::STATE_RUNNING } ? true : false
You can simplify this as:
instances.any? {|i| i.state == Instance::STATE_RUNNING }
- end
- def uptime_1st_instance
- unless events.empty?
You can replace this ^ with:
return unless event.empty?
This will decrease the indentation level of the rest of the body.
unless instances.deployed.empty?
I think it's more readable to use if/else than unless/else. Unless should be used only when there's no else block, imho.
if instances.count> 1&& events.find_by_status_code("1st instance running")Time.now.utc - events.find_by_status_code("1st instance running").event_timeelsif events.find_by_status_code("All instances running")Time.now.utc - events.find_by_status_code("All instances running").event_timeendelseif instances.count> 1&& events.find_by_status_code("All instances stopped")&& events.find_by_status_code("1st instance running")events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("1st instance running").event_timeelsif events.find_by_status_code("All instances stopped")&& events.find_by_status_code("All instances running")events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("All instances running").event_timeendend- end
- end
- def uptime_all
- unless events.empty?
if instances.deployed.count == instances.count&& events.last.status_code == "All instances running"
As soon as we add other events to the deployments, the code above will break, because `events.last` can be some other unrelated event.
Something like Event.find :last, :conditions => { :status_code => "All instances running" }
would be more reliable. But then you'd have to check that no instance_stopped event follows this one.
It may be a good idea to create a scope or a filter function that would return you only the events you care about: 'all running','1st running', 'all stopped', etc.
Time.now.utc - events.last.event_timeelsif instances.count> 1&& events.find_by_status_code("All instances running")&& events.find_by_status_code("Any instances running")events.find_by_status_code("Any instances running").event_time - events.find_by_status_code("All instances running").event_timeelsif events.find_by_status_code("All instances stopped")&& events.find_by_status_code("All instances running")events.find_by_status_code("All instances stopped").event_time - events.find_by_status_code("All instances running").event_timeend- end
- end end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..52317f4 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance< ActiveRecord::Base }) end
- def first_running?
- (deployment.instances.detect {|i| i.state == Instance::STATE_RUNNING&& i != self} ? false : true) if deployment
Again, you can replace `detect` with `any?` and get rid of the `?` operator:
(not deployment.instances.any? {|i| i.state == Instance::STATE_RUNNING && i != self}) if deployment
end
private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_')
- end
- end end
diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a805743 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,23 @@ class InstanceObserver< ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save!
if instance.state == Instance::STATE_RUNNING&& instance.deploymentevent2 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "1st instance running") if instance.first_running?event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "All instances running") if instance.deployment.all_instances_running?event2.save! if event2
Jan's comment on the previous patch still stand here, I think.
If the deployment has only 1 instance, the "1st instance running" event will not be logged. Please fix it so that it does.
Doing this will simplify the `uptime_1st_instance` and `uptime_all` methods, too.
elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_ERROR)&& instance.deploymentif instance.deployment.any_instance_running?&& !(instance.deployment.events.empty?)
Again, relying on deployment.events to be empty will break as soon as we add unrelated events for deployments.
It would be good if you could scope/filter it out by the supported status_codes.
event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "Any instances running") unless instance.deployment.events.last.status_code == "Any instances running"
The same point as before ^, as soon as we add more deployment events, this will break.
elseevent3 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "All instances stopped")endevent3.save! if event3endenddiff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
Layout.scss is autogenerated (it's written in its header). Ken Keiter is in charge of that.
Please send the changes to Ken so he can incorporate them into the layout.scss or put them into custom.scss (which exists for this purpose).
index af41d65..7fdab64 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -2191,7 +2191,7 @@ ul.deployment-array.large + ul.deployment-array.large{ /********************************************* Small Deployable Card Arrays */ /************************************************************************** */
-$deployment-small-height: 84px; +$deployment-small-height: 110px; /*change it from 84px, because of uptimes displaying*/ $deployment-small-width: 174px; $deployment-small-padding: 8px;
diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment)
Global uptime= count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances
%dd= deployment.instances.count || 0\ No newline at end of file
%dd= deployment.instances.count || 0%li.left%dt Uptime%dd= count_uptime(deployment.uptime_1st_instance)\ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
it "count_uptime should return right values" do
count_uptime(Time.now-(Time.now-10)).should be_trueend
it "count_uptime should return N/A if nil is passed as parameter" do
count_uptime(nil).should == "N/A"end
end
end
diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end
- it "should be return nil if deployment has no events " do
- deployment = Factory :deployment
- deployment.uptime_1st_instance.should be_nil
- deployment.uptime_all.should be_nil
- end
- it "should return false if no deployed instances" do
- deployment = Factory.build :deployment
- instance = Factory.build(:mock_running_instance, :deployment => deployment)
- instance2 = Factory.build(:mock_pending_instance, :deployment => deployment)
- deployment.stub(:instances){[instance, instance2]}
- deployment.any_instance_running?.should be_true
- instance.state = Instance::STATE_PENDING
- deployment.any_instance_running?.should be_false
- end end
diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4f419f2 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN
- @instance.save!;
@instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end
- it "should create event when one of deployment's instance stop/fail'" do
- deployment = Factory :deployment
- instance1 = Factory :mock_running_instance, :deployment => deployment
- instance2 = Factory :mock_running_instance, :deployment => deployment
- instance3 = Factory :mock_pending_instance, :deployment => deployment
- instance3.state = Instance::STATE_RUNNING
- instance3.save!
- instance2.state = Instance::STATE_ERROR
- instance2.save!
- deployment.events.last.status_code.should == "Any instances running"
- end
- end
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..78d0c0f 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -211,4 +211,28 @@ describe Instance do export_string.include?("Instance").should be_true export_string.include?("created").should be_true end
- context "When more instances of deployment are starting" do
- it "should return true if first instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment => deployment)instance2 = Factory.build(:mock_pending_instance, :deployment => deployment)instance3 = Factory.build(:mock_pending_instance, :deployment => deployment)deployment.stub(:instances){[instance1, instance2, instance3]}instance1.first_running?.should be_trueinstance2.state = Instance::STATE_RUNNINGinstance1.first_running?.should be_false- end
- it "should return true if all instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment => deployment)instance2 = Factory.build(:mock_running_instance, :deployment => deployment)instance3 = Factory.build(:mock_pending_instance, :deployment => deployment)deployment.stub(:instances){[instance1, instance3, instance2]}deployment.all_instances_running?.should be_falseinstance3.state = Instance::STATE_RUNNINGdeployment.all_instances_running?.should be_true- end
- end end
From: Jozef Zigmund jzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes: - 1st instance running - when 1st instance of deployment is running(start point of counting uptime) - all instances runinng - when all instances of deployment are running(start point of counting global uptime) - any instances running - when one of running instances is stopped/failed(end point of counting global uptime) - all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime) --- src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 +++++++++------- src/app/models/deployment.rb | 39 ++++++++++++++++++++++ src/app/models/event.rb | 2 + src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 18 ++++++++++ src/app/stylesheets/custom.scss | 4 ++ src/app/views/deployments/_pretty_view.haml | 2 +- src/app/views/deployments/_properties.haml | 6 +++ src/app/views/pools/_deployments.haml | 8 ++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 +++++++++ src/spec/models/instance_observer_spec.rb | 15 ++++++++- src/spec/models/instance_spec.rb | 46 +++++++++++++++++++++++++++ 14 files changed, 184 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr' - #gem 'webmock' #gem 'launchy' + #gem 'ruby-debug' + #gem 'webmock' end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time) - result_string = [] - difference = Time.now.utc - start_time + def count_uptime(time) + if time + result_string = []
- seconds = difference % 60 - difference = (difference - seconds) / 60 - minutes = difference % 60 - difference = (difference - minutes) / 60 - hours = difference % 24 - difference = (difference - hours) / 24 - days = difference % 7 + seconds = time % 60 + time = (time - seconds) / 60 + minutes = time % 60 + time = (time - minutes) / 60 + hours = time % 24 + time = (time - hours) / 24 + days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0 - result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" - result_string.join(", ") + result_string<< pluralize(days.to_i, 'day') if days != 0 + result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" + result_string.join(", ") + else + "N/A" + end end
def owner_name(obj) diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..a9db8c9 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id" + + has_many :events, :as => :source + after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id @@ -243,4 +246,40 @@ class Deployment < ActiveRecord::Base end errs end + + def all_instances_running? + instances.deployed.count == instances.count + end + + def any_instance_running? + instances.any? {|i| i.state == Instance::STATE_RUNNING } + end + + def uptime_1st_instance + return if events.empty? + if instances.deployed.empty? + if instances.count > 1 && events.find_by_status_code(:all_stopped) && events.find_by_status_code(:first_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end + else + if instances.count > 1 && events.find_by_status_code(:first_running) + Time.now.utc - events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_running) + Time.now.utc - events.find_by_status_code(:all_running).event_time + end + end + end + + def uptime_all + return if events.empty? + if instances.deployed.count == instances.count && events.find_by_status_code(:all_running) + Time.now.utc - events.last.event_time + elsif instances.count > 1 && events.find_by_status_code(:all_running) && events.find_by_status_code(:some_stopped) + events.find_by_status_code(:some_stopped).event_time - events.find_by_status_code(:all_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end + end end diff --git a/src/app/models/event.rb b/src/app/models/event.rb index 1e17f35..4e54da6 100644 --- a/src/app/models/event.rb +++ b/src/app/models/event.rb @@ -39,4 +39,6 @@ class Event < ActiveRecord::Base
validates_presence_of :source_id validates_presence_of :source_type + + scope :lifetime, where(:status_code => [:first_running, :all_running, :some_running, :all_stopped]) end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..72be16e 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance < ActiveRecord::Base }) end
+ def first_running? + deployment.instances.deployed.detect {|i| i != self} ? false : true + end + private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_') - end + end end diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a78966a 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,24 @@ class InstanceObserver < ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save! + if instance.state == Instance::STATE_RUNNING && instance.deployment + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "first_running", :summary => "1st instance is running") if instance.first_running? + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "all_running", :summary => "All instances are running") if instance.deployment.all_instances_running? + event2.save! if event2 + event3.save! if event3 + elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_ERROR) && instance.deployment + if instance.deployment.any_instance_running? && !(instance.deployment.events.empty?) + event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "some_stopped", :summary => "Some instances are stopped") if instance.deployment.events.lifetime.last{|e|e.status_code == :all_running} + else + event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "all_stopped", :summary => "All instances are stopped") + end + event4.save! if event4 + end + end end
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index fae47c7..967d848 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -77,4 +77,8 @@ footer.standard{ height: 30px; display:block; background: url(../../images/loading.gif) no-repeat center; +} + +ul.deployment-array.small li.deployment { + height: 90px; } \ No newline at end of file diff --git a/src/app/views/deployments/_pretty_view.haml b/src/app/views/deployments/_pretty_view.haml index 76b5ca5..b04b579 100644 --- a/src/app/views/deployments/_pretty_view.haml +++ b/src/app/views/deployments/_pretty_view.haml @@ -8,7 +8,7 @@ %ul %li.uptime %dt.uptime Uptime - %dd= count_uptime(deployment.created_at) + %dd= count_uptime(deployment.uptime_1st_instance) %li.instances %dt.instances.count Instances %dd diff --git a/src/app/views/deployments/_properties.haml b/src/app/views/deployments/_properties.haml index 0168eb7..e7deb23 100644 --- a/src/app/views/deployments/_properties.haml +++ b/src/app/views/deployments/_properties.haml @@ -8,6 +8,12 @@ %tr %td=key.to_s.capitalize %td=value + %tr + %td Global Uptime + %td=count_uptime(@deployment.uptime_all) + %tr + %td Uptime 1st instance running + %td=count_uptime(@deployment.uptime_1st_instance)
:javascript Conductor.setupPrettyFilterURL( diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment) + Global uptime + = count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances - %dd= deployment.instances.count || 0 \ No newline at end of file + %dd= deployment.instances.count || 0 + + %li.left + %dt Uptime + %dd= count_uptime(deployment.uptime_1st_instance) \ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
+ it "count_uptime should return right values" do + count_uptime(Time.now-(Time.now-10)).should be_true + end + + it "count_uptime should return N/A if nil is passed as parameter" do + count_uptime(nil).should == "N/A" + end + end
end diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end + + it "should be return nil if deployment has no events " do + deployment = Factory :deployment + deployment.uptime_1st_instance.should be_nil + deployment.uptime_all.should be_nil + end + + it "should return false if no deployed instances" do + deployment = Factory.build :deployment + instance = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance, instance2]} + deployment.any_instance_running?.should be_true + instance.state = Instance::STATE_PENDING + deployment.any_instance_running?.should be_false + end end diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4be3b1e 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN - @instance.save!; + @instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end + + it "should create event when one of deployment's instance stop/fail'" do + deployment = Factory :deployment + instance1 = Factory :mock_running_instance, :deployment => deployment + instance2 = Factory :mock_running_instance, :deployment => deployment + instance3 = Factory :mock_pending_instance, :deployment => deployment + instance3.state = Instance::STATE_RUNNING + instance3.save! + instance2.state = Instance::STATE_ERROR + instance2.save! + deployment.events.last.status_code.should == "some_stopped" + end + end diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..bafac16 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -210,5 +210,51 @@ describe Instance do export_string.include?(instance.id.to_s).should be_true export_string.include?("Instance").should be_true export_string.include?("created").should be_true + + context "When more instances of deployment are starting" do + it "should return true if first instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance1.state = Instance::STATE_RUNNING + deployment.stub(:instances){[instance1, instance2, instance3]} + instance1.first_running?.should be_true + instance2.state = Instance::STATE_RUNNING + instance1.first_running?.should be_false + end + + it "should return true if first instance of deployment is running" do + deployment = Factory.build :deployment + instance1 = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_running_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance1, instance3, instance2]} + instance1.all_running?.should be_false + instance3.state = Instance::STATE_RUNNING + instance1.all_running?.should be_true + end + end + + context "When more instances of deployment are starting" do + it "should return true if first instance of deployment is running" do + deployment = Factory :deployment + instance1 = Factory(:mock_running_instance, :deployment => deployment) + instance2 = Factory(:mock_pending_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + instance1.first_running?.should be_true + instance2.update_attribute :state, Instance::STATE_RUNNING + instance2.first_running?.should be_false + end + + it "should return true if all instance of deployment is running" do + deployment = Factory :deployment + instance1 = Factory(:mock_running_instance, :deployment => deployment) + instance2 = Factory(:mock_running_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + deployment.all_instances_running?.should be_false + instance3.update_attribute :state, Instance::STATE_RUNNING + deployment.all_instances_running?.should be_true + end end end
On Thursday 01 September 2011 20:38:01 jzigmund@redhat.com wrote:
From: Jozef Zigmund jzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes: - 1st instance running - when 1st instance of deployment is running(start point of counting uptime) - all instances runinng - when all instances of deployment are running(start point of counting global uptime)
- any instances running - when one of running instances is
stopped/failed(end point of counting global uptime) - all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime) --- src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 +++++++++------- src/app/models/deployment.rb | 39 ++++++++++++++++++++++ src/app/models/event.rb | 2 + src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 18 ++++++++++ src/app/stylesheets/custom.scss | 4 ++ src/app/views/deployments/_pretty_view.haml | 2 +- src/app/views/deployments/_properties.haml | 6 +++ src/app/views/pools/_deployments.haml | 8 ++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 +++++++++ src/spec/models/instance_observer_spec.rb | 15 ++++++++- src/spec/models/instance_spec.rb | 46 +++++++++++++++++++++++++++ 14 files changed, 184 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr'
- #gem 'webmock' #gem 'launchy'
- #gem 'ruby-debug'
- #gem 'webmock'
end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time)
- result_string = []
- difference = Time.now.utc - start_time
- def count_uptime(time)
- if time
result_string = []
- seconds = difference % 60
- difference = (difference - seconds) / 60
- minutes = difference % 60
- difference = (difference - minutes) / 60
- hours = difference % 24
- difference = (difference - hours) / 24
- days = difference % 7
seconds = time % 60time = (time - seconds) / 60minutes = time % 60time = (time - minutes) / 60hours = time % 24time = (time - hours) / 24days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0
result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%secon ds.to_i}" - result_string.join(", ")
result_string<< pluralize(days.to_i, 'day') if days != 0result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%secon ds.to_i}" + result_string.join(", ")
else
"N/A"end end
def owner_name(obj)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..a9db8c9 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment < ActiveRecord::Base
:include => [:role], :order => "permissions.id ASC"belongs_to :owner, :class_name => "User", :foreign_key => "owner_id"
has_many :events, :as => :source
after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id
@@ -243,4 +246,40 @@ class Deployment < ActiveRecord::Base end errs end
- def all_instances_running?
- instances.deployed.count == instances.count
- end
- def any_instance_running?
- instances.any? {|i| i.state == Instance::STATE_RUNNING }
- end
- def uptime_1st_instance
- return if events.empty?
- if instances.deployed.empty?
if instances.count > 1 && events.find_by_status_code(:all_stopped)&& events.find_by_status_code(:first_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end
- else
if instances.count > 1 && events.find_by_status_code(:first_running)Time.now.utc -events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_running)
Time.now.utc - events.find_by_status_code(:all_running).event_timeend- end
- end
- def uptime_all
- return if events.empty?
- if instances.deployed.count == instances.count &&
events.find_by_status_code(:all_running) + Time.now.utc - events.last.event_time
- elsif instances.count > 1 && events.find_by_status_code(:all_running)
&& events.find_by_status_code(:some_stopped) + events.find_by_status_code(:some_stopped).event_time - events.find_by_status_code(:all_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end
- end
end diff --git a/src/app/models/event.rb b/src/app/models/event.rb index 1e17f35..4e54da6 100644 --- a/src/app/models/event.rb +++ b/src/app/models/event.rb @@ -39,4 +39,6 @@ class Event < ActiveRecord::Base
validates_presence_of :source_id validates_presence_of :source_type
- scope :lifetime, where(:status_code => [:first_running, :all_running,
:some_running, :all_stopped]) end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..72be16e 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance < ActiveRecord::Base }) end
def first_running?
deployment.instances.deployed.detect {|i| i != self} ? false : true
end
private
def key_name
"#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.\ -]/, '_') - end
- end
end diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a78966a 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,24 @@ class InstanceObserver < ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now,
:summary => "state changed to #{instance.state}") event.save!
if instance.state == Instance::STATE_RUNNING && instance.deploymentevent2 = Event.new(:source => instance.deployment, :event_time =>DateTime.now, + :status_code => "first_running", :summary => "1st instance is running") if instance.first_running? + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "all_running", :summary => "All instances are running") if instance.deployment.all_instances_running? + event2.save! if event2
event3.save! if event3elsif (instance.state == Instance::STATE_STOPPED || instance.state== Instance::STATE_ERROR) && instance.deployment + if instance.deployment.any_instance_running? && !(instance.deployment.events.empty?) + event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "some_stopped", :summary => "Some instances are stopped") if instance.deployment.events.lifetime.last{|e|e.status_code == :all_running} + else
event4 = Event.new(:source => instance.deployment, :event_time=> DateTime.now, + :status_code => "all_stopped", :summary => "All instances are stopped") + end
event4.save! if event4end- end end
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index fae47c7..967d848 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -77,4 +77,8 @@ footer.standard{ height: 30px; display:block; background: url(../../images/loading.gif) no-repeat center; +}
+ul.deployment-array.small li.deployment {
- height: 90px;
} \ No newline at end of file diff --git a/src/app/views/deployments/_pretty_view.haml b/src/app/views/deployments/_pretty_view.haml index 76b5ca5..b04b579 100644 --- a/src/app/views/deployments/_pretty_view.haml +++ b/src/app/views/deployments/_pretty_view.haml @@ -8,7 +8,7 @@ %ul %li.uptime %dt.uptime Uptime
%dd= count_uptime(deployment.created_at)
%dd= count_uptime(deployment.uptime_1st_instance) %li.instances %dt.instances.count Instances %dddiff --git a/src/app/views/deployments/_properties.haml b/src/app/views/deployments/_properties.haml index 0168eb7..e7deb23 100644 --- a/src/app/views/deployments/_properties.haml +++ b/src/app/views/deployments/_properties.haml @@ -8,6 +8,12 @@ %tr %td=key.to_s.capitalize %td=value
- %tr
- %td Global Uptime
- %td=count_uptime(@deployment.uptime_all)
- %tr
- %td Uptime 1st instance running
- %td=count_uptime(@deployment.uptime_1st_instance)
:javascript
Conductor.setupPrettyFilterURL( diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment)
Global uptime= count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances
%dd= deployment.instances.count || 0\ No newline at end of file
%dd= deployment.instances.count || 0%li.left%dt Uptime%dd= count_uptime(deployment.uptime_1st_instance)\ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
- it "count_uptime should return right values" do
count_uptime(Time.now-(Time.now-10)).should be_true- end
- it "count_uptime should return N/A if nil is passed as parameter" do
count_uptime(nil).should == "N/A"- end
- end
end diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end
- it "should be return nil if deployment has no events " do
- deployment = Factory :deployment
- deployment.uptime_1st_instance.should be_nil
- deployment.uptime_all.should be_nil
- end
- it "should return false if no deployed instances" do
- deployment = Factory.build :deployment
- instance = Factory.build(:mock_running_instance, :deployment =>
deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance, instance2]}
- deployment.any_instance_running?.should be_true
- instance.state = Instance::STATE_PENDING
- deployment.any_instance_running?.should be_false
- end
end diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4be3b1e 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN
- @instance.save!;
@instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end
- it "should create event when one of deployment's instance stop/fail'" do
- deployment = Factory :deployment
- instance1 = Factory :mock_running_instance, :deployment => deployment
- instance2 = Factory :mock_running_instance, :deployment => deployment
- instance3 = Factory :mock_pending_instance, :deployment => deployment
- instance3.state = Instance::STATE_RUNNING
- instance3.save!
- instance2.state = Instance::STATE_ERROR
- instance2.save!
- deployment.events.last.status_code.should == "some_stopped"
- end
end diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..bafac16 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -210,5 +210,51 @@ describe Instance do export_string.include?(instance.id.to_s).should be_true export_string.include?("Instance").should be_true export_string.include?("created").should be_true
- context "When more instances of deployment are starting" do
- it "should return true if first instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment =>deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + instance1.state = Instance::STATE_RUNNING
deployment.stub(:instances){[instance1, instance2, instance3]}instance1.first_running?.should be_trueinstance2.state = Instance::STATE_RUNNINGinstance1.first_running?.should be_false- end
- it "should return true if first instance of deployment is running" do
deployment = Factory.build :deploymentinstance1 = Factory.build(:mock_running_instance, :deployment =>deployment) + instance2 = Factory.build(:mock_running_instance, :deployment => deployment) + instance3 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance1, instance3, instance2]} + instance1.all_running?.should be_false
instance3.state = Instance::STATE_RUNNINGinstance1.all_running?.should be_true- end
- end
- context "When more instances of deployment are starting" do
- it "should return true if first instance of deployment is running" do
deployment = Factory :deploymentinstance1 = Factory(:mock_running_instance, :deployment =>deployment) + instance2 = Factory(:mock_pending_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + instance1.first_running?.should be_true
instance2.update_attribute :state, Instance::STATE_RUNNINGinstance2.first_running?.should be_false- end
- it "should return true if all instance of deployment is running" do
deployment = Factory :deploymentinstance1 = Factory(:mock_running_instance, :deployment =>deployment) + instance2 = Factory(:mock_running_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + deployment.all_instances_running?.should be_false
instance3.update_attribute :state, Instance::STATE_RUNNINGdeployment.all_instances_running?.should be_true- end end
end
Please ignore this patch, one test is failing, I'm fixing it and I'll resend the patch soon.
From: Jozef Zigmund jzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes: - 1st instance running - when 1st instance of deployment is running(start point of counting uptime) - all instances runinng - when all instances of deployment are running(start point of counting global uptime) - any instances running - when one of running instances is stopped/failed(end point of counting global uptime) - all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime) --- src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 +++++++++++--------- src/app/models/deployment.rb | 39 +++++++++++++++++++++++++++ src/app/models/event.rb | 2 + src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 18 ++++++++++++ src/app/stylesheets/custom.scss | 4 +++ src/app/views/deployments/_pretty_view.haml | 2 +- src/app/views/deployments/_properties.haml | 6 ++++ src/app/views/pools/_deployments.haml | 8 +++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 +++++++++++ src/spec/models/instance_observer_spec.rb | 15 +++++++++- src/spec/models/instance_spec.rb | 22 +++++++++++++++ 14 files changed, 160 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr' - #gem 'webmock' #gem 'launchy' + #gem 'ruby-debug' + #gem 'webmock' end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time) - result_string = [] - difference = Time.now.utc - start_time + def count_uptime(time) + if time + result_string = []
- seconds = difference % 60 - difference = (difference - seconds) / 60 - minutes = difference % 60 - difference = (difference - minutes) / 60 - hours = difference % 24 - difference = (difference - hours) / 24 - days = difference % 7 + seconds = time % 60 + time = (time - seconds) / 60 + minutes = time % 60 + time = (time - minutes) / 60 + hours = time % 24 + time = (time - hours) / 24 + days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0 - result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" - result_string.join(", ") + result_string<< pluralize(days.to_i, 'day') if days != 0 + result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}" + result_string.join(", ") + else + "N/A" + end end
def owner_name(obj) diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..a9db8c9 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id" + + has_many :events, :as => :source + after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id @@ -243,4 +246,40 @@ class Deployment < ActiveRecord::Base end errs end + + def all_instances_running? + instances.deployed.count == instances.count + end + + def any_instance_running? + instances.any? {|i| i.state == Instance::STATE_RUNNING } + end + + def uptime_1st_instance + return if events.empty? + if instances.deployed.empty? + if instances.count > 1 && events.find_by_status_code(:all_stopped) && events.find_by_status_code(:first_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end + else + if instances.count > 1 && events.find_by_status_code(:first_running) + Time.now.utc - events.find_by_status_code(:first_running).event_time + elsif events.find_by_status_code(:all_running) + Time.now.utc - events.find_by_status_code(:all_running).event_time + end + end + end + + def uptime_all + return if events.empty? + if instances.deployed.count == instances.count && events.find_by_status_code(:all_running) + Time.now.utc - events.last.event_time + elsif instances.count > 1 && events.find_by_status_code(:all_running) && events.find_by_status_code(:some_stopped) + events.find_by_status_code(:some_stopped).event_time - events.find_by_status_code(:all_running).event_time + elsif events.find_by_status_code(:all_stopped) && events.find_by_status_code(:all_running) + events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time + end + end end diff --git a/src/app/models/event.rb b/src/app/models/event.rb index 1e17f35..4e54da6 100644 --- a/src/app/models/event.rb +++ b/src/app/models/event.rb @@ -39,4 +39,6 @@ class Event < ActiveRecord::Base
validates_presence_of :source_id validates_presence_of :source_type + + scope :lifetime, where(:status_code => [:first_running, :all_running, :some_running, :all_stopped]) end diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..72be16e 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance < ActiveRecord::Base }) end
+ def first_running? + deployment.instances.deployed.detect {|i| i != self} ? false : true + end + private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_') - end + end end diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a78966a 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,24 @@ class InstanceObserver < ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save! + if instance.state == Instance::STATE_RUNNING && instance.deployment + event2 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "first_running", :summary => "1st instance is running") if instance.first_running? + event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "all_running", :summary => "All instances are running") if instance.deployment.all_instances_running? + event2.save! if event2 + event3.save! if event3 + elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_ERROR) && instance.deployment + if instance.deployment.any_instance_running? && !(instance.deployment.events.empty?) + event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "some_stopped", :summary => "Some instances are stopped") if instance.deployment.events.lifetime.last{|e|e.status_code == :all_running} + else + event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now, + :status_code => "all_stopped", :summary => "All instances are stopped") + end + event4.save! if event4 + end + end end
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index fae47c7..967d848 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -77,4 +77,8 @@ footer.standard{ height: 30px; display:block; background: url(../../images/loading.gif) no-repeat center; +} + +ul.deployment-array.small li.deployment { + height: 90px; } \ No newline at end of file diff --git a/src/app/views/deployments/_pretty_view.haml b/src/app/views/deployments/_pretty_view.haml index 76b5ca5..b04b579 100644 --- a/src/app/views/deployments/_pretty_view.haml +++ b/src/app/views/deployments/_pretty_view.haml @@ -8,7 +8,7 @@ %ul %li.uptime %dt.uptime Uptime - %dd= count_uptime(deployment.created_at) + %dd= count_uptime(deployment.uptime_1st_instance) %li.instances %dt.instances.count Instances %dd diff --git a/src/app/views/deployments/_properties.haml b/src/app/views/deployments/_properties.haml index 0168eb7..e7deb23 100644 --- a/src/app/views/deployments/_properties.haml +++ b/src/app/views/deployments/_properties.haml @@ -8,6 +8,12 @@ %tr %td=key.to_s.capitalize %td=value + %tr + %td Global Uptime + %td=count_uptime(@deployment.uptime_all) + %tr + %td Uptime 1st instance running + %td=count_uptime(@deployment.uptime_1st_instance)
:javascript Conductor.setupPrettyFilterURL( diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment) + Global uptime + = count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances - %dd= deployment.instances.count || 0 \ No newline at end of file + %dd= deployment.instances.count || 0 + + %li.left + %dt Uptime + %dd= count_uptime(deployment.uptime_1st_instance) \ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
+ it "count_uptime should return right values" do + count_uptime(Time.now-(Time.now-10)).should be_true + end + + it "count_uptime should return N/A if nil is passed as parameter" do + count_uptime(nil).should == "N/A" + end + end
end diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end + + it "should be return nil if deployment has no events " do + deployment = Factory :deployment + deployment.uptime_1st_instance.should be_nil + deployment.uptime_all.should be_nil + end + + it "should return false if no deployed instances" do + deployment = Factory.build :deployment + instance = Factory.build(:mock_running_instance, :deployment => deployment) + instance2 = Factory.build(:mock_pending_instance, :deployment => deployment) + deployment.stub(:instances){[instance, instance2]} + deployment.any_instance_running?.should be_true + instance.state = Instance::STATE_PENDING + deployment.any_instance_running?.should be_false + end end diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4be3b1e 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN - @instance.save!; + @instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end + + it "should create event when one of deployment's instance stop/fail'" do + deployment = Factory :deployment + instance1 = Factory :mock_running_instance, :deployment => deployment + instance2 = Factory :mock_running_instance, :deployment => deployment + instance3 = Factory :mock_pending_instance, :deployment => deployment + instance3.state = Instance::STATE_RUNNING + instance3.save! + instance2.state = Instance::STATE_ERROR + instance2.save! + deployment.events.last.status_code.should == "some_stopped" + end + end diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..2da0841 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -211,4 +211,26 @@ describe Instance do export_string.include?("Instance").should be_true export_string.include?("created").should be_true end + + context "When more instances of deployment are starting" do + it "should return true if first instance of deployment is running" do + deployment = Factory :deployment + instance1 = Factory(:mock_running_instance, :deployment => deployment) + instance2 = Factory(:mock_pending_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + instance1.first_running?.should be_true + instance2.update_attribute :state, Instance::STATE_RUNNING + instance2.first_running?.should be_false + end + + it "should return true if all instance of deployment is running" do + deployment = Factory :deployment + instance1 = Factory(:mock_running_instance, :deployment => deployment) + instance2 = Factory(:mock_running_instance, :deployment => deployment) + instance3 = Factory(:mock_pending_instance, :deployment => deployment) + deployment.all_instances_running?.should be_false + instance3.update_attribute :state, Instance::STATE_RUNNING + deployment.all_instances_running?.should be_true + end + end end
On 09/02/2011 03:06 PM, jzigmund@redhat.com wrote:
From: Jozef Zigmundjzigmund@redhat.com
Added new events for counting uptimes of deployment with these status codes:
- 1st instance running - when 1st instance of deployment is running(start point of counting uptime)
- all instances runinng - when all instances of deployment are running(start point of counting global uptime)
- any instances running - when one of running instances is stopped/failed(end point of counting global uptime)
- all instances stopped - when all instances of deployment are stopped/failed(end point of counting uptime)
src/Gemfile | 3 +- src/app/helpers/application_helper.rb | 29 +++++++++++--------- src/app/models/deployment.rb | 39 +++++++++++++++++++++++++++ src/app/models/event.rb | 2 + src/app/models/instance.rb | 6 +++- src/app/models/instance_observer.rb | 18 ++++++++++++ src/app/stylesheets/custom.scss | 4 +++ src/app/views/deployments/_pretty_view.haml | 2 +- src/app/views/deployments/_properties.haml | 6 ++++ src/app/views/pools/_deployments.haml | 8 +++++- src/spec/helpers/application_helper_spec.rb | 8 +++++ src/spec/models/deployment_spec.rb | 16 +++++++++++ src/spec/models/instance_observer_spec.rb | 15 +++++++++- src/spec/models/instance_spec.rb | 22 +++++++++++++++ 14 files changed, 160 insertions(+), 18 deletions(-)
diff --git a/src/Gemfile b/src/Gemfile index 05d3b7c..a4cdab7 100644 --- a/src/Gemfile +++ b/src/Gemfile @@ -31,6 +31,7 @@ group :development, :test do #gem 'cucumber-rails' #gem 'database_cleaner' #gem 'vcr'
- #gem 'webmock' #gem 'launchy'
- #gem 'ruby-debug'
- #gem 'webmock' end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 930ad49..ff1fca7 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -215,21 +215,24 @@ module ApplicationHelper title.split(' ').join('_').downcase end
- def count_uptime(start_time)
- result_string = []
- difference = Time.now.utc - start_time
- def count_uptime(time)
- if time
result_string = []
- seconds = difference % 60
- difference = (difference - seconds) / 60
- minutes = difference % 60
- difference = (difference - minutes) / 60
- hours = difference % 24
- difference = (difference - hours) / 24
- days = difference % 7
seconds = time % 60time = (time - seconds) / 60minutes = time % 60time = (time - minutes) / 60hours = time % 24time = (time - hours) / 24days = time % 7
- result_string<< pluralize(days.to_i, 'day') if days != 0
- result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"
- result_string.join(", ")
result_string<< pluralize(days.to_i, 'day') if days != 0result_string<<"#{"%02d"%hours.to_i}:#{"%02d"%minutes.to_i}:#{"%02d"%seconds.to_i}"result_string.join(", ")else
"N/A"end end
def owner_name(obj)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb index d0ee262..a9db8c9 100644 --- a/src/app/models/deployment.rb +++ b/src/app/models/deployment.rb @@ -50,6 +50,9 @@ class Deployment< ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" belongs_to :owner, :class_name => "User", :foreign_key => "owner_id"
has_many :events, :as => :source
after_create "assign_owner_roles(owner)"
validates_presence_of :pool_id
@@ -243,4 +246,40 @@ class Deployment< ActiveRecord::Base end errs end
- def all_instances_running?
- instances.deployed.count == instances.count
- end
- def any_instance_running?
- instances.any? {|i| i.state == Instance::STATE_RUNNING }
- end
- def uptime_1st_instance
- return if events.empty?
- if instances.deployed.empty?
if instances.count> 1&& events.find_by_status_code(:all_stopped)&& events.find_by_status_code(:first_running)events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:first_running).event_timeelsif events.find_by_status_code(:all_stopped)&& events.find_by_status_code(:all_running)events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_timeend- else
if instances.count> 1&& events.find_by_status_code(:first_running)Time.now.utc - events.find_by_status_code(:first_running).event_timeelsif events.find_by_status_code(:all_running)Time.now.utc - events.find_by_status_code(:all_running).event_timeend- end
- end
- def uptime_all
- return if events.empty?
- if instances.deployed.count == instances.count&& events.find_by_status_code(:all_running)
Time.now.utc - events.last.event_time- elsif instances.count> 1&& events.find_by_status_code(:all_running)&& events.find_by_status_code(:some_stopped)
events.find_by_status_code(:some_stopped).event_time - events.find_by_status_code(:all_running).event_time- elsif events.find_by_status_code(:all_stopped)&& events.find_by_status_code(:all_running)
events.find_by_status_code(:all_stopped).event_time - events.find_by_status_code(:all_running).event_time- end
- end end
diff --git a/src/app/models/event.rb b/src/app/models/event.rb index 1e17f35..4e54da6 100644 --- a/src/app/models/event.rb +++ b/src/app/models/event.rb @@ -39,4 +39,6 @@ class Event< ActiveRecord::Base
validates_presence_of :source_id validates_presence_of :source_type
- scope :lifetime, where(:status_code => [:first_running, :all_running, :some_running, :all_stopped]) end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index b682c06..72be16e 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -374,9 +374,13 @@ class Instance< ActiveRecord::Base }) end
def first_running?
deployment.instances.deployed.detect {|i| i != self} ? false : true
end
private
def key_name "#{self.name}_#{Time.now.to_i}_key_#{self.object_id}".gsub(/[^a-zA-Z0-9.-]/, '_')
- end
- end end
diff --git a/src/app/models/instance_observer.rb b/src/app/models/instance_observer.rb index a7b53ed..a78966a 100644 --- a/src/app/models/instance_observer.rb +++ b/src/app/models/instance_observer.rb @@ -72,6 +72,24 @@ class InstanceObserver< ActiveRecord::Observer event = Event.new(:source => instance, :event_time => DateTime.now, :summary => "state changed to #{instance.state}") event.save!
if instance.state == Instance::STATE_RUNNING&& instance.deploymentevent2 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "first_running", :summary => "1st instance is running") if instance.first_running?event3 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "all_running", :summary => "All instances are running") if instance.deployment.all_instances_running?event2.save! if event2event3.save! if event3elsif (instance.state == Instance::STATE_STOPPED || instance.state == Instance::STATE_ERROR)&& instance.deploymentif instance.deployment.any_instance_running?&& !(instance.deployment.events.empty?)event4 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "some_stopped", :summary => "Some instances are stopped") if instance.deployment.events.lifetime.last{|e|e.status_code == :all_running}elseevent4 = Event.new(:source => instance.deployment, :event_time => DateTime.now,:status_code => "all_stopped", :summary => "All instances are stopped")endevent4.save! if event4endenddiff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index fae47c7..967d848 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -77,4 +77,8 @@ footer.standard{ height: 30px; display:block; background: url(../../images/loading.gif) no-repeat center; +}
+ul.deployment-array.small li.deployment {
- height: 90px; }
\ No newline at end of file diff --git a/src/app/views/deployments/_pretty_view.haml b/src/app/views/deployments/_pretty_view.haml index 76b5ca5..b04b579 100644 --- a/src/app/views/deployments/_pretty_view.haml +++ b/src/app/views/deployments/_pretty_view.haml @@ -8,7 +8,7 @@ %ul %li.uptime %dt.uptime Uptime
%dd= count_uptime(deployment.created_at)
%dd= count_uptime(deployment.uptime_1st_instance) %li.instances %dt.instances.count Instances %dddiff --git a/src/app/views/deployments/_properties.haml b/src/app/views/deployments/_properties.haml index 0168eb7..e7deb23 100644 --- a/src/app/views/deployments/_properties.haml +++ b/src/app/views/deployments/_properties.haml @@ -8,6 +8,12 @@ %tr %td=key.to_s.capitalize %td=value
%tr
%td Global Uptime
%td=count_uptime(@deployment.uptime_all)
%tr
%td Uptime 1st instance running
%td=count_uptime(@deployment.uptime_1st_instance)
:javascript Conductor.setupPrettyFilterURL(
diff --git a/src/app/views/pools/_deployments.haml b/src/app/views/pools/_deployments.haml index cdd99ad..6a4833a 100644 --- a/src/app/views/pools/_deployments.haml +++ b/src/app/views/pools/_deployments.haml @@ -4,8 +4,14 @@ %li.deployment %h3.name = link_to deployment.name, deployment_path(deployment)
Global uptime= count_uptime(deployment.uptime_all) %dl.statistics %ul %li.right %dt.instances.count Instances
%dd= deployment.instances.count || 0\ No newline at end of file
%dd= deployment.instances.count || 0%li.left%dt Uptime%dd= count_uptime(deployment.uptime_1st_instance)\ No newline at end of file diff --git a/src/spec/helpers/application_helper_spec.rb b/src/spec/helpers/application_helper_spec.rb index fe5c956..e417044 100644 --- a/src/spec/helpers/application_helper_spec.rb +++ b/src/spec/helpers/application_helper_spec.rb @@ -32,6 +32,14 @@ describe ApplicationHelper do node.first['id'].should == 'delete' end
it "count_uptime should return right values" do
count_uptime(Time.now-(Time.now-10)).should be_trueend
it "count_uptime should return N/A if nil is passed as parameter" do
count_uptime(nil).should == "N/A"end
end
end
diff --git a/src/spec/models/deployment_spec.rb b/src/spec/models/deployment_spec.rb index 7359910..182b48d 100644 --- a/src/spec/models/deployment_spec.rb +++ b/src/spec/models/deployment_spec.rb @@ -124,4 +124,20 @@ describe Deployment do lambda {Instance.find(inst1.id)}.should raise_error(ActiveRecord::RecordNotFound) lambda {Instance.find(inst2.id)}.should raise_error(ActiveRecord::RecordNotFound) end
- it "should be return nil if deployment has no events " do
- deployment = Factory :deployment
- deployment.uptime_1st_instance.should be_nil
- deployment.uptime_all.should be_nil
- end
- it "should return false if no deployed instances" do
- deployment = Factory.build :deployment
- instance = Factory.build(:mock_running_instance, :deployment => deployment)
- instance2 = Factory.build(:mock_pending_instance, :deployment => deployment)
- deployment.stub(:instances){[instance, instance2]}
- deployment.any_instance_running?.should be_true
- instance.state = Instance::STATE_PENDING
- deployment.any_instance_running?.should be_false
- end end
diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index c4d0a42..4be3b1e 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -77,7 +77,7 @@ describe InstanceObserver do
it "should set accumlated shutting down time when instance changes state from state shutting down" do @instance.state = Instance::STATE_SHUTTING_DOWN
- @instance.save!;
@instance.save!
Timecop.freeze(Time.now + 1.second)
@@ -199,4 +199,17 @@ describe InstanceObserver do @instance.instance_key.reload @instance.instance_key.should be_nil end
- it "should create event when one of deployment's instance stop/fail'" do
- deployment = Factory :deployment
- instance1 = Factory :mock_running_instance, :deployment => deployment
- instance2 = Factory :mock_running_instance, :deployment => deployment
- instance3 = Factory :mock_pending_instance, :deployment => deployment
- instance3.state = Instance::STATE_RUNNING
- instance3.save!
- instance2.state = Instance::STATE_ERROR
- instance2.save!
- deployment.events.last.status_code.should == "some_stopped"
- end
- end
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index da0f849..2da0841 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -211,4 +211,26 @@ describe Instance do export_string.include?("Instance").should be_true export_string.include?("created").should be_true end
- context "When more instances of deployment are starting" do
- it "should return true if first instance of deployment is running" do
deployment = Factory :deploymentinstance1 = Factory(:mock_running_instance, :deployment => deployment)instance2 = Factory(:mock_pending_instance, :deployment => deployment)instance3 = Factory(:mock_pending_instance, :deployment => deployment)instance1.first_running?.should be_trueinstance2.update_attribute :state, Instance::STATE_RUNNINGinstance2.first_running?.should be_false- end
- it "should return true if all instance of deployment is running" do
deployment = Factory :deploymentinstance1 = Factory(:mock_running_instance, :deployment => deployment)instance2 = Factory(:mock_running_instance, :deployment => deployment)instance3 = Factory(:mock_pending_instance, :deployment => deployment)deployment.all_instances_running?.should be_falseinstance3.update_attribute :state, Instance::STATE_RUNNINGdeployment.all_instances_running?.should be_true- end
- end end
ACK & pushed with a few tiny fixes.
Thomas
aeolus-devel@lists.fedorahosted.org
-
Jan Provazník -
jzigmund＠redhat.com -
Tomas Sedovic