right_agent 0.10.12 → 0.10.13

data/lib/right_agent/sender.rb

@@ -1130,7 +1130,13 @@ module RightScale
     def publish_with_timeout_retry(request, parent, count = 0, multiplier = 1, elapsed = 0, broker_ids = nil)
       published_broker_ids = publish(request, broker_ids)
 
-      if @retry_interval && @retry_timeout && parent && !published_broker_ids.empty?
+      if published_broker_ids.empty?
+        # Could not publish request to any brokers, so respond with non-delivery
+        # to allow requester, e.g., IdempotentRequest, to retry
+        result = OperationResult.non_delivery("request send failed")
+        @non_delivery_stats.update(result.content)
+        handle_response(Result.new(request.token, request.reply_to, result, @identity))
+      elsif @retry_interval && @retry_timeout && parent
         interval = [(@retry_interval * multiplier) + (@request_stats.avg_duration || 0), @retry_timeout - elapsed].min
         EM.add_timer(interval) do
           begin

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.10.12'
-  spec.date      = '2012-08-27'
+  spec.version   = '0.10.13'
+  spec.date      = '2013-02-07'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/sender_spec.rb

@@ -381,6 +381,7 @@ describe RightScale::Sender do
       @timer = flexmock("timer")
       flexmock(EM::Timer).should_receive(:new).and_return(@timer).by_default
       flexmock(EM).should_receive(:next_tick).and_yield.by_default
+      flexmock(EM).should_receive(:defer).and_yield.by_default
       @broker_id = "broker"
       @broker_ids = [@broker_id]
       @broker = flexmock("Broker", :subscribe => true, :publish => @broker_ids, :connected? => true,
@@ -414,7 +415,7 @@ describe RightScale::Sender do
     it "should create a Request object" do
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.class.should == RightScale::Request
-      end, hsh(:persistent => false, :mandatory => true)).once
+      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
@@ -432,7 +433,7 @@ describe RightScale::Sender do
         request.from.should == 'agent'
         request.target.should be_nil
         request.expires_at.should == 1000100
-      end, hsh(:persistent => false, :mandatory => true)).once
+      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
@@ -444,14 +445,14 @@ describe RightScale::Sender do
       flexmock(Time).should_receive(:now).and_return(Time.at(1000000))
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.expires_at.should == 0
-      end, hsh(:persistent => false, :mandatory => true)).once
+      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
     it "should set the correct target if specified" do
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.target.should == 'my-target'
-      end, hsh(:persistent => false, :mandatory => true)).once
+      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac', 'my-target') {|response|}
     end
 
@@ -460,7 +461,7 @@ describe RightScale::Sender do
         request.tags.should == ['tag']
         request.selector.should == :any
         request.scope.should == {:account => 123}
-      end, hsh(:persistent => false, :mandatory => true)).once
+      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac', :tags => ['tag'], :scope => {:account => 123})
     end
 
@@ -511,7 +512,7 @@ describe RightScale::Sender do
         @agent.should_receive(:options).and_return({:retry_timeout => nil})
         RightScale::Sender.new(@agent)
         @instance = RightScale::Sender.instance
-        @broker.should_receive(:publish).once
+        @broker.should_receive(:publish).and_return(["rs-broker-host-123"]).once
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
@@ -520,7 +521,7 @@ describe RightScale::Sender do
         @agent.should_receive(:options).and_return({:retry_interval => nil})
         RightScale::Sender.new(@agent)
         @instance = RightScale::Sender.instance
-        @broker.should_receive(:publish).once
+        @broker.should_receive(:publish).and_return(["rs-broker-host-123"]).once
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
@@ -533,6 +534,20 @@ describe RightScale::Sender do
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
+      it "should respond with non-delivery if publish failed" do
+        flexmock(EM).should_receive(:add_timer).never
+        @agent.should_receive(:options).and_return({:retry_timeout => 60, :retry_interval => 60})
+        RightScale::Sender.new(@agent)
+        @instance = RightScale::Sender.instance
+        @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers).once
+        @broker.should_receive(:publish).and_raise(RightAMQP::HABrokerClient::NoConnectedBrokers).once
+        @instance.send_retryable_request('/welcome/aboard', 'iZac') do |response|
+          result = RightScale::OperationResult.from_results(response)
+          result.non_delivery?.should be_true
+          result.content.should == "request send failed"
+        end
+      end
+
       it "should setup for retry if retry_timeout and retry_interval not nil and publish successful" do
         flexmock(EM).should_receive(:add_timer).with(60, any).once
         @agent.should_receive(:options).and_return({:retry_timeout => 60, :retry_interval => 60})

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 12
-  version: 0.10.12
+  prerelease: 
+  version: 0.10.13
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,124 +12,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 -07:00
-default_executable: 
+date: 2013-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: right_support
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
         version: "1.3"
     - - <
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
-  requirement: *id001
-  name: right_support
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: right_amqp
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
         version: "0.3"
-  requirement: *id002
-  name: right_amqp
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: json
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
         version: "1.4"
-  requirement: *id003
-  name: json
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: eventmachine
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
-  requirement: *id004
-  name: eventmachine
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: right_popen
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 0
-        - 11
         version: 1.0.11
-  requirement: *id005
-  name: right_popen
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: msgpack
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
         version: 0.4.4
-  requirement: *id006
-  name: msgpack
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: net-ssh
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
-  requirement: *id007
-  name: net-ssh
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id007
 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
@@ -298,7 +257,6 @@ files:
 - spec/spec.win32.opts
 - spec/spec_helper.rb
 - spec/tracer_spec.rb
-has_rdoc: true
 homepage: https://github.com/rightscale/right_agent
 licenses: []
 
@@ -315,25 +273,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2192797536970431426
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Agent for interfacing server with RightScale system