right_agent 2.6.1 → 2.6.2

data/lib/right_agent/agent.rb

@@ -676,10 +676,12 @@ module RightScale
       when "Push"
         packet = RightScale::Push.new(event[:path], event[:data], {:from => event[:from], :token => event[:uuid]})
         packet.expires_at = event[:expires_at].to_i if event.has_key?(:expires_at)
+        packet.skewed_by = event[:skewed_by].to_i if event.has_key?(:skewed_by)
       when "Request"
         options = {:from => event[:from], :token => event[:uuid], :reply_to => event[:reply_to], :tries => event[:tries]}
         packet = RightScale::Request.new(event[:path], event[:data], options)
         packet.expires_at = event[:expires_at].to_i if event.has_key?(:expires_at)
+        packet.skewed_by = event[:skewed_by].to_i if event.has_key?(:skewed_by)
       end
       packet
     end

data/lib/right_agent/offline_handler.rb

@@ -168,6 +168,7 @@ module RightScale
     # token(String):: Token uniquely identifying request
     # expires_at(Integer):: Time in seconds in Unix-epoch when this request expires and
     #   is to be ignored by the receiver; value 0 means never expire
+    # skewed_by(Integer):: Amount of skew already applied to expires_at in seconds
     #
     # === Block
     # Optional block used to process response asynchronously with the following parameter:
@@ -175,9 +176,10 @@ module RightScale
     #
     # === Return
     # true:: Always return true
-    def queue_request(kind, type, payload, target, token, expires_at, &callback)
+    def queue_request(kind, type, payload, target, token, expires_at, skewed_by, &callback)
       request = {:kind => kind, :type => type, :payload => payload, :target => target,
-                 :token => token, :expires_at => expires_at, :callback => callback}
+                 :token => token, :expires_at => expires_at, :skewed_by => skewed_by,
+                 :callback => callback}
       Log.info("[offline] Queuing request: #{request.inspect}")
       vote_to_restart if (@restart_vote_count += 1) >= MAX_QUEUED_REQUESTS
       if @state == :initializing

data/lib/right_agent/packets.rb

@@ -285,7 +285,7 @@ module RightScale
   class Request < Packet
 
     attr_accessor :from, :scope, :payload, :type, :token, :reply_to, :selector, :target, :persistent, :expires_at,
-                  :tags, :tries
+                  :skewed_by, :tags, :tries
 
     DEFAULT_OPTIONS = {:selector => :any}
 
@@ -306,6 +306,7 @@ module RightScale
     #     by the AMQP broker
     #   :expires_at(Integer|nil):: Time in seconds in Unix-epoch when this request expires and
     #      is to be ignored by the receiver; value 0 means never expire; defaults to 0
+    #   :skewed_by(Integer|nil):: Amount of skew already applied to expires_at in seconds
     #   :tags(Array(Symbol)):: List of tags to be used for selecting target for this request
     #   :tries(Array):: List of tokens for previous attempts to send this request
     # version(Array):: Protocol version of the original creator of the packet followed by the
@@ -324,6 +325,7 @@ module RightScale
       @target     = opts[:target]
       @persistent = opts[:persistent]
       @expires_at = opts[:expires_at] || 0
+      @skewed_by  = opts[:skewed_by] || 0
       @tags       = opts[:tags] || []
       @tries      = opts[:tries] || []
       @version    = version
@@ -348,16 +350,17 @@ module RightScale
     def self.create(o)
       i = o['data']
       expires_at = if i.has_key?('created_at')
-        created_at = i['created_at'].to_i
-        created_at > 0 ? created_at + (15 * 60) : 0
-      else
-        i['expires_at']
-      end
+                     created_at = i['created_at'].to_i
+                     created_at > 0 ? created_at + (15 * 60) : 0
+                   else
+                     i['expires_at']
+                   end
       new(i['type'], i['payload'], { :from       => self.compatible(i['from']), :scope      => i['scope'],
                                      :token      => i['token'],                 :reply_to   => self.compatible(i['reply_to']),
                                      :selector   => i['selector'],              :target     => self.compatible(i['target']),
                                      :persistent => i['persistent'],            :tags       => i['tags'],
-                                     :expires_at => expires_at,                 :tries      => i['tries'] },
+                                     :expires_at => expires_at,                 :skewed_by  => i['skewed_by'],
+                                     :tries      => i['tries'] },
           i['version'] || [DEFAULT_VERSION, DEFAULT_VERSION], o['size'])
     end
 
@@ -416,7 +419,7 @@ module RightScale
   class Push < Packet
 
     attr_accessor :from, :scope, :payload, :type, :token, :selector, :target, :persistent, :confirm,
-                  :expires_at, :tags
+                  :expires_at, :skewed_by, :tags
 
     DEFAULT_OPTIONS = {:selector => :any}
 
@@ -437,6 +440,7 @@ module RightScale
     #     to which request was published but not necessarily delivered
     #   :expires_at(Integer|nil):: Time in seconds in Unix-epoch when this request expires and
     #      is to be ignored by the receiver; value 0 means never expire; defaults to 0
+    #   :skewed_by(Integer|nil):: Amount of skew already applied to expires_at in seconds
     #   :tags(Array(Symbol)):: List of tags to be used for selecting target for this request
     # version(Array):: Protocol version of the original creator of the packet followed by the
     #   protocol version of the packet contents to be used when sending
@@ -454,6 +458,7 @@ module RightScale
       @persistent = opts[:persistent]
       @confirm    = opts[:confirm]
       @expires_at = opts[:expires_at] || 0
+      @skewed_by  = opts[:skewed_by] || 0
       @tags       = opts[:tags] || []
       @version    = version
       @size       = size
@@ -485,11 +490,11 @@ module RightScale
     # (Push):: New packet
     def self.create(o)
       i = o['data']
-      new(i['type'], i['payload'], { :from    => self.compatible(i['from']),   :scope      => i['scope'],
-                                     :token   => i['token'],                   :selector   => i['selector'],
-                                     :target  => self.compatible(i['target']), :persistent => i['persistent'],
-                                     :confirm => i['confirm'],                 :expires_at => i['expires_at'],
-                                     :tags    => i['tags']},
+      new(i['type'], i['payload'], { :from      => self.compatible(i['from']),   :scope      => i['scope'],
+                                     :token     => i['token'],                   :selector   => i['selector'],
+                                     :target    => self.compatible(i['target']), :persistent => i['persistent'],
+                                     :confirm   => i['confirm'],                 :expires_at => i['expires_at'],
+                                     :skewed_by => i['skewed_by'],               :tags       => i['tags'] },
           i['version'] || [DEFAULT_VERSION, DEFAULT_VERSION], o['size'])
     end
 

data/lib/right_agent/platform/unix/linux/platform.rb

@@ -268,6 +268,7 @@ module RightScale
       private
 
       def scan_for_failed_packages(output_text, regex)
+        output_text = output_text.force_encoding("UTF-8") if output_text.respond_to?(:force_encoding)
         @output = output_text
         failed_packages = []
         output_text.scan(regex) { |package| failed_packages << package.last }

data/lib/right_agent/sender.rb

@@ -346,7 +346,7 @@ module RightScale
       end
 
       if queueing?
-        @offline_handler.queue_request(kind, type, payload, target, packet.token, packet.expires_at, &callback)
+        @offline_handler.queue_request(kind, type, payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
         nil
       else
         packet
@@ -637,7 +637,7 @@ module RightScale
         result = error_result(e.message)
       rescue Exceptions::ConnectivityFailure => e
         if queueing?
-          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, &callback)
+          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
           result = nil
         else
           result = retry_result(e.message)
@@ -696,7 +696,7 @@ module RightScale
       rescue TemporarilyOffline => e
         if queueing?
           # Queue request until come back online
-          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, &callback)
+          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
           @pending_requests.delete(packet.token) if callback
         else
           # Send retry response so that requester, e.g., RetryableRequest, can retry

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.6.1'
-  spec.date      = '2015-07-02'
+  spec.version   = '2.6.2'
+  spec.date      = '2015-09-16'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/offline_handler_spec.rb

@@ -196,14 +196,15 @@ describe RightScale::OfflineHandler do
       @now = Time.now
       flexmock(Time).should_receive(:now).and_return(@now)
       @expires_at = @now + 25
+      @skewed_by = 1
       @callback = lambda { |_| }
     end
 
     it "queues request at head of queue if still initializing" do
       @handler.init
-      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, &@callback).should be_true
+      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, @skewed_by, &@callback).should be_true
       @handler.queue.size.should == 1
-      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, &@callback).should be_true
+      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, @skewed_by, &@callback).should be_true
       @handler.queue.size.should == 2
       @handler.queue.first[:target] == "target2"
     end
@@ -211,9 +212,9 @@ describe RightScale::OfflineHandler do
     it "queues request at end of queue if no longer initializing" do
       @handler.init
       @handler.start
-      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, &@callback)
+      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, @skewed_by, &@callback)
       @handler.queue.size.should == 1
-      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, &@callback)
+      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, @skewed_by, &@callback)
       @handler.queue.size.should == 2
       @handler.queue.first[:target] == "target1"
     end
@@ -223,7 +224,7 @@ describe RightScale::OfflineHandler do
       @handler.start
       flexmock(@handler).should_receive(:vote_to_restart).once
       RightScale::OfflineHandler::MAX_QUEUED_REQUESTS.times do |i|
-        @handler.queue_request(@kind, @type, @payload, @target, @token, @expires_at, &@callback)
+        @handler.queue_request(@kind, @type, @payload, @target, @token, @expires_at, @skewed_by, &@callback)
       end
     end
   end
@@ -249,6 +250,7 @@ describe RightScale::OfflineHandler do
       @now = Time.now
       flexmock(Time).should_receive(:now).and_return(@now)
       @expires_at = (@now + 25).to_i
+      @skewed_by = 1
       @result = nil
       @callback = lambda { |result| @result = result }
     end
@@ -259,9 +261,9 @@ describe RightScale::OfflineHandler do
         @handler.start
         flexmock(@handler).should_receive(:start_timer)
         @handler.enable
-        @handler.queue_request(:send_push, @type, @payload, @target, @token, 0)
-        @handler.queue_request(:send_request, @type, @payload, @target, @token, @expires_at, &@callback)
-        @handler.queue_request(:send_request, @type, @payload, @target, @token, @now.to_i, &@callback)
+        @handler.queue_request(:send_push, @type, @payload, @target, @token, 0, 0)
+        @handler.queue_request(:send_request, @type, @payload, @target, @token, @expires_at, @skewed_by, &@callback)
+        @handler.queue_request(:send_request, @type, @payload, @target, @token, @now.to_i, @skewed_by, &@callback)
         @handler.queue.size.should == 3
         flexmock(EM).should_receive(:next_tick).and_yield.twice
         @sender.should_receive(:send_push).with(@type, @payload, @target, {:token => @token}).once.ordered

data/spec/sender_spec.rb

@@ -427,7 +427,7 @@ describe RightScale::Sender do
             @sender = create_sender(:http, :offline_queueing => true)
             flexmock(@sender.offline_handler).should_receive(:queueing?).and_return(true)
             flexmock(@sender.offline_handler).should_receive(:queue_request).
-                with(kind, @type, @payload, @target, @token, (@now + @ttl).to_i, @callback).once
+                with(kind, @type, @payload, @target, @token, (@now + @ttl).to_i, 0, @callback).once
             @sender.build_packet(kind, @type, @payload, @target, @options, &@callback).should be nil
           end
         end
@@ -779,7 +779,7 @@ describe RightScale::Sender do
               @sender.enable_offline_mode
               @client.should_receive(:request).and_raise(RightScale::Exceptions::ConnectivityFailure, "disconnected").once
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i).once
+                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i, 0).once
               flexmock(@sender).should_receive(:handle_response).never
               @sender.send(:http_send_once, :send_push, @target, @packet, @received_at).should be_true
             end
@@ -792,7 +792,7 @@ describe RightScale::Sender do
               @sender.enable_offline_mode
               @client.should_receive(:request).and_raise(RightScale::Exceptions::ConnectivityFailure, "disconnected").once
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_request, @type, @payload, @target, @token, (@now + @ttl).to_i, @callback).once
+                  with(:send_request, @type, @payload, @target, @token, (@now + @ttl).to_i, 0, @callback).once
               flexmock(@sender).should_receive(:handle_response).never
               @sender.send(:http_send_once, :send_request, @target, @packet, @received_at, &@callback).should be_true
             end
@@ -886,7 +886,7 @@ describe RightScale::Sender do
               @sender.initialize_offline_queue
               @sender.enable_offline_mode
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i).once
+                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i, 0).once
               flexmock(@sender).should_receive(:amqp_send_once).and_raise(RightScale::Sender::TemporarilyOffline).once
               @sender.send(:amqp_send, :send_push, @target, @packet, @received_at).should be_true
               @sender.pending_requests[@token].should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -415,10 +415,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1688678042091044964
+      hash: 1050806856707624160
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.26
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Agent for interfacing server with RightScale system