right_agent 0.16.2 → 0.17.0

data/lib/right_agent/agent.rb

@@ -795,8 +795,10 @@ module RightScale
       true
     end
 
-    # Check status of agent by gathering current operation statistics and publishing them
-    # and finishing any queue setup
+    # Check status of agent by finishing any queue setup, checking the status of the queues,
+    # and gathering/publishing current operation statistics
+    # Checking the status of a queue will cause the broker connection to fail if the
+    # queue does not exist, but a reconnect should then get initiated on the next check loop
     # Although agent termination cancels the check_status_timer, this method could induce
     # termination, therefore the termination status needs to be checked before each step
     #
@@ -810,6 +812,13 @@ module RightScale
         @exception_stats.track("check status", e)
       end
 
+      begin
+        @broker.queue_status(@queues, timeout = @options[:check_interval] / 10) unless @terminating
+      rescue Exception => e
+        Log.error("Failed checking queue status", e)
+        @exception_stats.track("check status", e)
+      end
+
       begin
         if @stats_routing_key && !@terminating
           exchange = {:type => :topic, :name => "stats", :options => {:no_declare => true}}

data/lib/right_agent/sender.rb

@@ -148,7 +148,7 @@ module RightScale
       MAX_QUEUE_FLUSH_DELAY = 2 * 60
 
       # Maximum number of offline queued requests before triggering restart vote
-      MAX_QUEUED_REQUESTS = 1000
+      MAX_QUEUED_REQUESTS = 100
 
       # Number of seconds that should be spent in offline mode before triggering a restart vote
       RESTART_VOTE_DELAY = 15 * 60
@@ -470,6 +470,8 @@ module RightScale
                 Log.error("Failed to reconnect to broker #{@ping_id}", e, :trace)
                 @exception_stats.track("ping timeout", e)
               end
+            else
+              @ping_timer = nil
             end
           end
 

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.16.2'
-  spec.date      = '2013-07-17'
+  spec.version   = '0.17.0'
+  spec.date      = '2013-08-04'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
-  spec.add_dependency('right_amqp', '~> 0.4')
+  spec.add_dependency('right_amqp', '~> 0.7')
   spec.add_dependency('json', ['>= 1.4', '<= 1.7.6']) # json_create behavior change in 1.7.7
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('msgpack', ['>= 0.4.4', '< 0.6'])

data/spec/agent_spec.rb

@@ -304,6 +304,7 @@ describe RightScale::Agent do
         run_in_em do
           @broker.should_receive(:subscribe).with(hsh(:name => @identity), nil, hsh(:brokers => nil), Proc).
                                              and_return(@broker_ids.first(1)).once
+          @broker.should_receive(:queue_status).with([@identity], 30).once
           @agent.run
           @agent.instance_variable_get(:@remaining_queue_setup).should == {@identity => @broker_ids.last(1)}
           @sender.should_receive(:send_push).with("/registrar/connect", {:agent_identity => @identity, :host => "123",

data/spec/sender_spec.rb

@@ -140,12 +140,14 @@ describe RightScale::Sender do
         EM.run do
           EM.add_timer(1) { EM.stop }
           RightScale::Sender.new(@agent)
-          instance = RightScale::Sender.instance
-          flexmock(instance).should_receive(:publish).and_return([]).once
-          instance.connectivity_checker.check(id = nil)
+          @instance = RightScale::Sender.instance
+          flexmock(@instance).should_receive(:publish).and_return([]).once
+          @instance.connectivity_checker.check(id = nil)
         end
       ensure
         RightScale::Sender::ConnectivityChecker.const_set(:PING_TIMEOUT, old_ping_timeout)
+        @instance.connectivity_checker.instance_variable_get(:@ping_timer).should be_nil
+        @instance.connectivity_checker.instance_variable_get(:@ping_id).should be_nil
       end
     end
 

metadata

@@ -1,164 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: right_agent
-version: !ruby/object:Gem::Version 
-  hash: 91
-  prerelease: false
-  segments: 
-  - 0
-  - 16
-  - 2
-  version: 0.16.2
+version: !ruby/object:Gem::Version
+  version: 0.17.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Lee Kirchhoff
 - Raphael Simon
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-17 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-08-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: right_support
+  requirement: &2168887200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.4.1
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id001
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  name: right_support
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168887200
+- !ruby/object:Gem::Dependency
+  name: right_amqp
+  requirement: &2168885180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  name: right_amqp
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168885180
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2168883820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 7
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.7.6
-  requirement: *id003
   type: :runtime
-  name: json
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168883820
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &2168882040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  name: eventmachine
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168882040
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: &2168880380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.4
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  requirement: *id005
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  name: msgpack
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168880380
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &2168878400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id006
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  name: net-ssh
   prerelease: false
-description: |
-  RightAgent provides a foundation for running an agent on a server to interface
+  version_requirements: *2168878400
+description: ! 'RightAgent provides a foundation for running an agent on a server
+  to interface
+
   in a secure fashion with other agents in the RightScale system. A RightAgent
+
   uses RabbitMQ as the message bus and the RightScale mapper as the routing node.
+
   Servers running a RightAgent establish a queue on startup for receiving packets
+
   routed to it via the mapper. The packets are structured to invoke services in
+
   the agent represented by actors and methods. The RightAgent may respond to these
+
   requests with a result packet that the mapper then routes to the originator.
 
+'
 email: lee@rightscale.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -311,44 +265,35 @@ files:
 - spec/spec.win32.opts
 - spec/spec_helper.rb
 - spec/tracer_spec.rb
-has_rdoc: true
 homepage: https://github.com/rightscale/right_agent
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --title
 - RightAgent
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4577991098158607352
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Agent for interfacing server with RightScale system
 test_files: []
-