right_agent 0.6.6 → 0.9.3

data/lib/right_agent/agent.rb

@@ -31,7 +31,6 @@ module RightScale
 
     include ConsoleHelper
     include DaemonizeHelper
-    include StatsHelper
 
     # (String) Identity of this agent
     attr_reader :identity
@@ -45,7 +44,7 @@ module RightScale
     # (ActorRegistry) Registry for this agents actors
     attr_reader :registry
 
-    # (HABrokerClient) High availability AMQP broker client
+    # (RightAMQP::HABrokerClient) High availability AMQP broker client
     attr_reader :broker
 
     # (Array) Tag strings published by agent
@@ -174,6 +173,7 @@ module RightScale
     def run
       Log.init(@identity, @options[:log_path], :print => true)
       Log.level = @options[:log_level] if @options[:log_level]
+      RightSupport::Log::Mixin.default_logger = Log
       Log.debug("Start options:")
       log_opts = @options.inject([]){ |t, (k, v)| t << "-  #{k}: #{v}" }
       log_opts.each { |l| Log.debug(l) }
@@ -188,7 +188,7 @@ module RightScale
 
         # Initiate AMQP broker connection, wait for connection before proceeding
         # otherwise messages published on failed connection will be lost
-        @broker = HABrokerClient.new(Serializer.new(:secure), @options)
+        @broker = RightAMQP::HABrokerClient.new(Serializer.new(:secure), @options)
         @all_setup.each { |s| @remaining_setup[s] = @broker.all }
         @broker.connection_status(:one_off => @options[:connect_timeout]) do |status|
           if status == :connected
@@ -259,14 +259,15 @@ module RightScale
     def tune_heartbeat(heartbeat)
       res = nil
       begin
+        Log.info("[setup] Reconnecting each broker to tune heartbeat to #{heartbeat}")
         @broker.heartbeat = heartbeat
         update_configuration(:heartbeat => heartbeat)
         ids = []
         all = @broker.all
         all.each do |id|
           begin
-            host, port, index, priority, island_id = @broker.identity_parts(id)
-            @broker.connect(host, port, index, priority, island = nil, force = true) do |id|
+            host, port, index, priority = @broker.identity_parts(id)
+            @broker.connect(host, port, index, priority, force = true) do |id|
               @broker.connection_status(:one_off => @options[:connect_timeout], :brokers => [id]) do |status|
                 begin
                   if status == :connected
@@ -321,7 +322,7 @@ module RightScale
       Log.info("Current broker configuration: #{@broker.status.inspect}")
       res = nil
       begin
-        @broker.connect(host, port, index, priority, nil, force) do |id|
+        @broker.connect(host, port, index, priority, force) do |id|
           @broker.connection_status(:one_off => @options[:connect_timeout], :brokers => [id]) do |status|
             begin
               if status == :connected
@@ -342,7 +343,7 @@ module RightScale
           end
         end
       rescue Exception => e
-        res = Log.format("Failed to connect to broker #{HABrokerClient.identity(host, port)}", e)
+        res = Log.format("Failed to connect to broker #{RightAMQP::HABrokerClient.identity(host, port)}", e)
         @exceptions.track("connect", e)
       end
       Log.error(res) if res
@@ -364,7 +365,7 @@ module RightScale
       and_remove = " and removing" if remove
       Log.info("Disconnecting#{and_remove} broker at host #{host.inspect} port #{port.inspect}")
       Log.info("Current broker configuration: #{@broker.status.inspect}")
-      id = HABrokerClient.identity(host, port)
+      id = RightAMQP::HABrokerClient.identity(host, port)
       @connect_requests.update("disconnect #{@broker.alias_(id)}")
       connected = @broker.connected
       res = nil
@@ -434,7 +435,7 @@ module RightScale
         when Result        then @sender.handle_response(packet)
         end
         @sender.message_received
-      rescue HABrokerClient::NoConnectedBrokers => e
+      rescue RightAMQP::HABrokerClient::NoConnectedBrokers => e
         Log.error("Identity queue processing error", e)
       rescue Exception => e
         Log.error("Identity queue processing error", e, :trace)
@@ -578,9 +579,9 @@ module RightScale
     # === Return
     # true:: Always return true
     def reset_agent_stats
-      @connect_requests = ActivityStats.new(measure_rate = false)
-      @non_deliveries = ActivityStats.new
-      @exceptions = ExceptionStats.new(self, @options[:exception_callback])
+      @connect_requests = RightSupport::Stats::Activity.new(measure_rate = false)
+      @non_deliveries = RightSupport::Stats::Activity.new
+      @exceptions = RightSupport::Stats::Exceptions.new(self, @options[:exception_callback])
       true
     end
 
@@ -625,7 +626,7 @@ module RightScale
     # (Boolean):: true if successful, otherwise false
     def update_configuration(opts)
       if cfg = AgentConfig.load_cfg(@agent_name)
-        opts.each { |k, v| cfg[k] = v if cfg.has_key?(k) }
+        opts.each { |k, v| cfg[k] = v }
         AgentConfig.store_cfg(@agent_name, cfg)
         true
       else
@@ -739,28 +740,18 @@ module RightScale
     def finish_setup
       @broker.failed.each do |id|
         p = {:agent_identity => @identity}
-        p[:host], p[:port], p[:id], p[:priority], _ = @broker.identity_parts(id)
+        p[:host], p[:port], p[:id], p[:priority] = @broker.identity_parts(id)
         @sender.send_push("/registrar/connect", p)
       end
       true
     end
 
     # Check status of agent by gathering current operation statistics and publishing them,
-    # executing any deferred tasks, and finishing any queue setup
+    # finishing any queue setup, and executing any deferred tasks
     #
     # === Return
     # true:: Always return true
     def check_status
-      @deferred_tasks.reject! do |t|
-        begin
-          t.call
-        rescue Exception => e
-          Log.error("Failed to perform deferred task", e)
-          @exceptions.track("check status", e)
-        end
-        true
-      end
-
       begin
         finish_setup
       rescue Exception => e
@@ -779,6 +770,16 @@ module RightScale
         @exceptions.track("check status", e)
       end
 
+      @deferred_tasks.reject! do |t|
+        begin
+          t.call
+        rescue Exception => e
+          Log.error("Failed to perform deferred task", e)
+          @exceptions.track("check status", e)
+        end
+        true
+      end
+
       @check_status_count += 1
       true
     end

data/lib/right_agent/agent_config.rb

@@ -63,7 +63,7 @@ module RightScale
   module AgentConfig
 
     # Current agent protocol version
-    PROTOCOL_VERSION = 18
+    PROTOCOL_VERSION = 20
 
     # Current agent protocol version
     #
@@ -73,6 +73,32 @@ module RightScale
       PROTOCOL_VERSION
     end
 
+    # Default thread name when no thread is specified for an executable bundle.
+    DEFAULT_THREAD_NAME = 'default'
+
+    # Default thread name when no thread is specified for an executable bundle.
+    #
+    # === Return
+    # (String):: default thread name...
+    def self.default_thread_name
+      DEFAULT_THREAD_NAME
+    end
+
+    # Regular expression to define what a valid thread name looks like: an alpha character
+    # followed by 0 or more alphanumerics or underscores. Only lower-case characters are
+    # allowed.
+    VALID_THREAD_NAME   = /^[a-z][a-z0-9_]*$/
+
+    # Regular expression to define what a valid thread name looks like: an alpha character
+    # followed by 0 or more alphanumerics or underscores. Only lower-case characters are
+    # allowed.
+    #
+    # === Return
+    # (String):: default thread name...
+    def self.valid_thread_name
+      VALID_THREAD_NAME
+    end
+
     # Initialize path to root directory of agent
     #
     # === Parameters
@@ -217,7 +243,7 @@ module RightScale
     # === Return
     # (String):: Directory path name
     def self.cfg_dir
-      @cfg_dir ||= Platform.filesystem.cfg_dir
+      @cfg_dir ||= Platform.filesystem.right_agent_cfg_dir
     end
 
     # Path to generated agent configuration file

data/lib/right_agent/command/command_constants.rb

@@ -26,8 +26,8 @@ module RightScale
   class CommandConstants
 
     # Ports used for command protocol
-    BASE_INSTANCE_AGENT_SOCKET_PORT         = 60000
-    BASE_INSTANCE_AGENT_CHECKER_SOCKET_PORT = 61000
+    BASE_INSTANCE_AGENT_SOCKET_PORT         = 53843 
+    BASE_INSTANCE_AGENT_CHECKER_SOCKET_PORT = 53844 
 
   end
 end

data/lib/right_agent/core_payload_types/executable_bundle.rb

@@ -35,14 +35,6 @@ module RightScale
 
     include Serializable
 
-    # Default thread name when no thread is specified for an executable bundle.
-    DEFAULT_THREAD_NAME = 'default'
-
-    # Regular expression to define what a valid thread name looks like: an alpha character
-    # followed by 0 or more alphanumerics or underscores. Only lower-case characters are
-    # allowed.
-    VALID_THREAD_NAME   = /^[a-z][a-z0-9_]*$/
-
     # (Array) Collection of RightScripts and chef recipes instantiations
     attr_accessor :executables
 
@@ -62,6 +54,9 @@ module RightScale
     # (String) Repose server to use
     attr_accessor :repose_servers
 
+    # (String) The name of the RIghtLink thread to run this bundle on
+    attr_accessor :thread_name
+
     # (Hash):: collection of repos to be checked out on the instance
     #   :key (String):: the hash id (SHA) of the repository
     #  :value (Hash):: repo and cookbook detail
@@ -126,18 +121,5 @@ module RightScale
       desc = @executables.collect { |e| e.nickname }.join(', ') if @executables
       desc ||= 'empty bundle'
     end
-
-    # Gets the thread name from a bundle, if any. Uses the default thread name for
-    # when a thread name is not specified (for backward compatibility, etc.).
-    #
-    # === Parameters
-    # bundle(ExecutableBundle):: bundle to inspect
-    #
-    # === Return
-    # thread_name(String):: thread name for bundle execution
-    def thread_name(value = nil)
-      @thread_name = value if value
-      return @thread_name || DEFAULT_THREAD_NAME
-    end
   end
 end

data/lib/right_agent/core_payload_types/login_user.rb

@@ -21,6 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+require 'net/ssh'
+
 module RightScale
 
   # Authorized user for the Managed Login feature
@@ -29,7 +31,7 @@ module RightScale
     include Serializable
 
     attr_accessor :uuid, :username, :public_key, :public_keys, :common_name,
-                  :superuser, :expires_at, :profile_data
+                  :superuser, :expires_at, :profile_data, :public_key_fingerprints
 
     # Initialize fields from given arguments
     def initialize(*args)
@@ -41,9 +43,10 @@ module RightScale
       @expires_at   = Time.at(args[5]) if args[5] && (args[5] != 0) # nil -> 0 because of expires_at.to_i below
       @public_keys  = args[6]
       @profile_data = args[7]
+      @public_key_fingerprints = args[8]
 
-      # we now expect an array of public_keys to be passed while supporting the
-      # singular public_key as a legacy member. when serialized back from a
+      # We now expect an array of public_keys to be passed while supporting the
+      # singular public_key as a legacy member. When serialized back from a
       # legacy LoginUser record, the singular value may be set while the plural
       # is nil.
       if @public_keys
@@ -53,11 +56,23 @@ module RightScale
         raise ArgumentError, "Expected public_key (third argument) to be a string" unless @public_key.is_a?(String)
         @public_keys = [@public_key]
       end
+
+      # The number of fingerprints must match the number of public keys
+      if @public_key_fingerprints && @public_key_fingerprints.size != @public_keys.size
+        raise ArgumentError, "Expected public_keys (seventh argument) array length (#{@public_keys.size}) is not " +
+                             "the same as the public_key_fingerprints (eighth argument) (#{@public_key_fingerprints.size})"
+      end
     end
 
     # Array of serialized fields given to constructor
     def serialized_members
-      [ @uuid, @username, @public_key, @common_name, @superuser, @expires_at.to_i, @public_keys, @profile_data ]
+      [ @uuid, @username, @public_key, @common_name, @superuser, @expires_at.to_i, @public_keys, @profile_data,
+        @public_key_fingerprints ]
+    end
+
+    # Create fingerprint for public key
+    def self.fingerprint(public_key)
+      Digest::SHA1.hexdigest(::Net::SSH::KeyFactory.load_data_public_key(public_key).to_der)
     end
 
   end

data/lib/right_agent/core_payload_types/recipe_instantiation.rb

@@ -43,17 +43,23 @@ module RightScale
     # (Array of SecureDocumentLocation) attributes that must be resolved by the instance
     attr_accessor :external_inputs
 
+    # (Hash) nil or Hash of input name to flags (array of string tokens) indicating additional
+    # boolean properties of the input which are useful to the instance. the presence of the
+    # flag means true, absence means false.
+    attr_accessor :input_flags
+
     def initialize(*args)
       @nickname        = args[0] if args.size > 0
       @attributes      = args[1] if args.size > 1
       @id              = args[2] if args.size > 2
       @ready           = args[3] if args.size > 3
       @external_inputs = args[4] if args.size > 4
+      @input_flags     = args[5] if args.size > 5
     end
 
     # Array of serialized fields given to constructor
     def serialized_members
-      [ @nickname, @attributes, @id, @ready, @external_inputs ]
+      [ @nickname, @attributes, @id, @ready, @external_inputs, @input_flags ]
     end
 
   end

data/lib/right_agent/core_payload_types/right_script_instantiation.rb

@@ -53,6 +53,11 @@ module RightScale
     # (Array of SecureDocumentLocation) attributes that must be resolved by the instance
     attr_accessor :external_inputs
 
+    # (Hash) nil or Hash of input name to flags (array of string tokens) indicating additional
+    # boolean properties of the input which are useful to the instance. the presence of the
+    # flag means true, absense means false.
+    attr_accessor :input_flags
+
     def initialize(*args)
       @nickname        = args[0] if args.size > 0
       @source          = args[1] if args.size > 1
@@ -62,11 +67,12 @@ module RightScale
       @id              = args[5] if args.size > 5
       @ready           = args[6] if args.size > 6
       @external_inputs = args[7] if args.size > 7
+      @input_flags     = args[8] if args.size > 8
     end
     
     # Array of serialized fields given to constructor
     def serialized_members
-      [ @nickname, @source, @parameters, @attachments, @packages, @id, @ready, @external_inputs ]
+      [ @nickname, @source, @parameters, @attachments, @packages, @id, @ready, @external_inputs, @input_flags ]
     end
     
   end

data/lib/right_agent/dispatcher.rb

@@ -25,8 +25,6 @@ module RightScale
   # Dispatching of payload to specified actor
   class Dispatcher
 
-    include StatsHelper
-
     # Response queue name
     RESPONSE_QUEUE = "response"
 
@@ -112,7 +110,7 @@ module RightScale
     # (String) Identity of associated agent
     attr_reader :identity
 
-    # (HABrokerClient) High availability AMQP broker client
+    # (RightAMQP::HABrokerClient) High availability AMQP broker client
     attr_reader :broker
 
     # (EM) Event machine class (exposed for unit tests)
@@ -174,7 +172,7 @@ module RightScale
       # Reject this request if its TTL has expired
       if (expires_at = request.expires_at) && expires_at > 0 && received_at.to_i >= expires_at
         @rejects.update("expired (#{method})")
-        Log.info("REJECT EXPIRED <#{token}> from #{request.from} TTL #{elapsed(received_at.to_i - expires_at)} ago")
+        Log.info("REJECT EXPIRED <#{token}> from #{request.from} TTL #{RightSupport::Stats.elapsed(received_at.to_i - expires_at)} ago")
         if request.is_a?(Request)
           # For agents that do not know about non-delivery, use error result
           non_delivery = if request.recv_version < 13
@@ -228,7 +226,7 @@ module RightScale
             exchange = {:type => :queue, :name => RESPONSE_QUEUE, :options => {:durable => true, :no_declare => @secure}}
             @broker.publish(exchange, r, :persistent => true, :mandatory => true, :log_filter => [:tries, :persistent, :duration])
           end
-        rescue HABrokerClient::NoConnectedBrokers => e
+        rescue RightAMQP::HABrokerClient::NoConnectedBrokers => e
           Log.error("Failed to publish result of dispatched request #{request.trace}", e)
         rescue Exception => e
           Log.error("Failed to publish result of dispatched request #{request.trace}", e, :trace)
@@ -298,9 +296,9 @@ module RightScale
     # === Return
     # true:: Always return true
     def reset_stats
-      @rejects = ActivityStats.new
-      @requests = ActivityStats.new
-      @exceptions = ExceptionStats.new(@agent)
+      @rejects = RightSupport::Stats::Activity.new
+      @requests = RightSupport::Stats::Activity.new
+      @exceptions = RightSupport::Stats::Exceptions.new(@agent)
       true
     end
 
@@ -335,17 +333,6 @@ module RightScale
       error
     end
 
-    # Convert value to nil if equals 0
-    #
-    # === Parameters
-    # value(Integer|nil):: Value to be converted
-    #
-    # === Return
-    # (Integer|nil):: Converted value
-    def nil_if_zero(value)
-      if !value || value == 0 then nil else value end
-    end
-
   end # Dispatcher
   
 end # RightScale

data/lib/right_agent/idempotent_request.rb

@@ -22,14 +22,46 @@
 
 module RightScale
 
+  # This is a retryable request for use when the execution of the request by the
+  # receiver is known to be idempotent and when there is a need to indefinitely
+  # pursue getting a usable response, e.g., when an instance is launching.
+  # It is implemented as an EM::Deferrable and as such invokes the Proc defined
+  # with its #callback method with the result content from a OperationResult::SUCCESS
+  # response, or it will invoke the Proc defined with its #errback method with error
+  # content if the response is an OperationResult::ERROR or CANCEL, or if the request
+  # has timed out. The request can be canceled with the #cancel method, or the receiver
+  # of the request may respond with a CANCEL result to cause the request to be canceled.
+  # This is useful in situations where the request is never expected to succeed
+  # regardless of the number of retries. By default if the response to the request
+  # is an OperationResult::RETRY or NON_DELIVERY indication, the request is automatically
+  # retried, as is also the case for an ERROR indication if the :retry_on_error option
+  # is specified. The retry algorithm is controlled by the :retry_delay, :retry_delay_count,
+  # and :max_retry_delay settings. The initial retry interval is the default or specified
+  # :retry_delay and this interval is used :retry_delay_count times, at which point the
+  # :retry_delay is doubled and the :retry_delay_count is halved. This backoff is again
+  # applied after the new :retry_delay_count is reached, and so on until :retry_delay
+  # reaches :max_retry_delay which then is used as the interval until the default or
+  # specified :timeout is reached. The default :timeout is 4 days.
   class IdempotentRequest
 
     include OperationResultHelper
     include EM::Deferrable
 
-    # Wait 5 seconds before retrying in case of failure
+    # Default delay before initial retry in case of failure with -1 meaning no delay
     DEFAULT_RETRY_DELAY = 5
 
+    # Default minimum number of retries before beginning backoff
+    DEFAULT_RETRY_DELAY_COUNT = 60
+
+    # Maximum default delay before retry when backing off
+    DEFAULT_MAX_RETRY_DELAY = 60
+
+    # Factor used for exponential backoff of retry delay
+    RETRY_BACKOFF_FACTOR = 2
+
+    # Default timeout with -1 meaning never timeout
+    DEFAULT_TIMEOUT = 4 * 24 * 60 * 60
+
     attr_reader :raw_response
 
     # Send idempotent request
@@ -37,18 +69,31 @@ module RightScale
     # Calls deferrable callback on completion, error callback on timeout
     #
     # === Parameters
-    # operation(String):: Request operation (i.e. '/booter/get_boot_bundle')
+    # operation(String):: Request operation (e.g., '/booter/get_boot_bundle')
     # payload(Hash):: Request payload
-    # options[:retry_on_error](FalseClass|TrueClass):: Whether request should be retried
-    #   if recipient returned an error
-    # options[:timeout](Fixnum):: Number of seconds before error callback gets called
-    # options[:retry_delay](Fixnum):: Number of seconds before retry, defaults to 5
-    def initialize(operation, payload, options={})
-      raise ArgumentError.new("options[:operation] is required") unless @operation = operation
-      raise ArgumentError.new("options[:payload] is required") unless @payload = payload
+    # options(Hash):: Request options
+    #   :targets(Array):: Targets from which to randomly choose one
+    #   :retry_on_error(Boolean):: Whether request should be retried if recipient returned an error
+    #   :retry_delay(Fixnum):: Number of seconds delay before initial retry with -1 meaning no delay,
+    #     defaults to DEFAULT_RETRY_DELAY
+    #   :retry_delay_count(Fixnum):: Minimum number of retries at initial :retry_delay value before
+    #     increasing delay exponentially and decreasing this count exponentially, defaults to
+    #     DEFAULT_RETRY_DELAY_COUNT
+    #   :max_retry_delay(Fixnum):: Maximum number of seconds of retry delay, defaults to DEFAULT_MAX_RETRY_DELAY
+    #   :timeout(Fixnum):: Number of seconds with no response before error callback gets called with
+    #     -1 meaning never, defaults to DEFAULT_TIMEOUT
+    #
+    # === Raises
+    # ArgumentError:: If operation or payload not specified
+    def initialize(operation, payload, options = {})
+      raise ArgumentError.new("operation is required") unless @operation = operation
+      raise ArgumentError.new("payload is required") unless @payload = payload
       @retry_on_error = options[:retry_on_error] || false
-      @timeout = options[:timeout] || -1
+      @timeout = options[:timeout] || DEFAULT_TIMEOUT
       @retry_delay = options[:retry_delay] || DEFAULT_RETRY_DELAY
+      @retry_delay_count = options[:retry_delay_count] || DEFAULT_RETRY_DELAY_COUNT
+      @max_retry_delay = options[:max_retry_delay] || DEFAULT_MAX_RETRY_DELAY
+      @retries = 0
       @targets = options[:targets]
       @raw_response = nil
       @done = false
@@ -64,7 +109,7 @@ module RightScale
       if @cancel_timer.nil? && @timeout > 0
         @cancel_timer = EM::Timer.new(@timeout) do
           msg = "Request #{@operation} timed out after #{@timeout} seconds"
-          log_info(msg)
+          Log.info(msg)
           cancel(msg)
         end
       end
@@ -101,7 +146,6 @@ module RightScale
       return true if @done
       @raw_response = r
       res = result_from(r)
-      res = OperationResult.non_delivery unless res
       if res.success?
         if @cancel_timer
           @cancel_timer.cancel
@@ -110,17 +154,28 @@ module RightScale
         @done = true
         succeed(res.content)
       else
+        reason = res.content
         if res.non_delivery?
-          Log.info("Request non-delivery (#{res.content}) for #{@operation}")
+          Log.info("Request non-delivery (#{reason}) for #{@operation}")
         elsif res.retry?
-          Log.info("RightScale not ready when trying to request #{@operation}")
+          reason = (reason && !reason.empty?) ? reason : "RightScale not ready"
+          Log.info("Request #{@operation} failed (#{reason}) and should be retried")
+        elsif res.cancel?
+          reason = (reason && !reason.empty?) ? reason : "RightScale cannot execute request"
+          Log.info("Request #{@operation} canceled (#{reason})")
         else
-          Log.info("Request #{@operation} failed (#{res.content})")
+          Log.info("Request #{@operation} failed (#{reason})")
         end
-        if res.non_delivery? || res.retry? || @retry_on_error
+        if (res.non_delivery? || res.retry? || @retry_on_error) && !res.cancel?
           Log.info("Retrying in #{@retry_delay} seconds...")
           if @retry_delay > 0
-            EM.add_timer(@retry_delay) { run }
+            this_delay = @retry_delay
+            if (@retries += 1) >= @retry_delay_count
+              @retry_delay = [@retry_delay * RETRY_BACKOFF_FACTOR, @max_retry_delay].min
+              @retry_delay_count = [@retry_delay_count / RETRY_BACKOFF_FACTOR, 1].max
+              @retries = 0
+            end
+            EM.add_timer(this_delay) { run }
           else
             EM.next_tick { run }
           end

data/lib/right_agent/monkey_patches/ruby_patch.rb

@@ -42,7 +42,6 @@ end
 RUBY_PATCH_BASE_DIR = File.join(File.dirname(__FILE__), 'ruby_patch')
 
 require File.normalize_path(File.join(RUBY_PATCH_BASE_DIR, 'array_patch'))
-require File.normalize_path(File.join(RUBY_PATCH_BASE_DIR, 'string_patch'))
 require File.normalize_path(File.join(RUBY_PATCH_BASE_DIR, 'object_patch'))
 require File.normalize_path(File.join(RUBY_PATCH_BASE_DIR, 'singleton_patch'))
 

data/lib/right_agent/monkey_patches.rb

@@ -25,5 +25,4 @@ require 'rbconfig'
 
 MONKEY_PATCHES_BASE_DIR = File.join(File.dirname(__FILE__), 'monkey_patches')
 
-require File.normalize_path(File.join(MONKEY_PATCHES_BASE_DIR, 'amqp_patch'))
 require File.normalize_path(File.join(MONKEY_PATCHES_BASE_DIR, 'ruby_patch'))

data/lib/right_agent/operation_result.rb

@@ -35,6 +35,7 @@ module RightScale
     RETRY        = 3
     NON_DELIVERY = 4
     MULTICAST    = 5 # Deprecated for agents at version 13 or above
+    CANCEL       = 6
 
     # Non-delivery reasons
     NON_DELIVERY_REASONS = [
@@ -81,9 +82,10 @@ module RightScale
       when SUCCESS      then 'success'
       when ERROR        then 'error' + (reason ? " (#{truncated_error})" : "")
       when CONTINUE     then 'continue'
-      when RETRY        then 'retry'
+      when RETRY        then 'retry' + (reason ? " (#{@content})" : "")
       when NON_DELIVERY then 'non-delivery' + (reason ? " (#{@content})" : "")
       when MULTICAST    then 'multicast'
+      when CANCEL       then 'cancel' + (reason ? " (#{@content})" : "")
       end
     end
 
@@ -126,7 +128,7 @@ module RightScale
     # Create new success status
     #
     # === Parameters
-    # content(Object):: Any data associated with successful results - defaults to nil
+    # content(Object):: Any data associated with successful results, defaults to nil
     #
     # === Return
     # (OperationResult):: Corresponding result
@@ -151,7 +153,7 @@ module RightScale
     # Create new continue status
     #
     # === Parameters
-    # content(Object):: Any data associated with continue - defaults to nil
+    # content(Object):: Any data associated with continue, defaults to nil
     #
     # === Return
     # (OperationResult):: Corresponding result
@@ -162,7 +164,7 @@ module RightScale
     # Create new retry status
     #
     # === Parameters
-    # content(Object):: Any data associated with retry - defaults to nil
+    # content(Object):: Any data associated with retry, defaults to nil
     #
     # === Return
     # (OperationResult):: Corresponding result
@@ -193,6 +195,17 @@ module RightScale
       OperationResult.new(MULTICAST, targets)
     end
 
+    # Cancel request and never retry
+    #
+    # === Parameters
+    # content(Object):: Any data associated with cancel, defaults to nil
+    #
+    # === Return
+    # (OperationResult):: Corresponding result
+    def self.cancel(content = nil)
+      OperationResult.new(CANCEL, content)
+    end
+
     # Was last operation successful?
     #
     # === Return
@@ -248,6 +261,15 @@ module RightScale
       status_code == MULTICAST
     end
 
+    # Was last operation status CANCEL?
+    #
+    # === Return
+    # true:: If status is CANCEL
+    # false:: Otherwise
+    def cancel?
+      status_code == CANCEL
+    end
+
     # Array of serialized fields given to constructor
     def serialized_members
       [@status_code, @content]
@@ -263,6 +285,7 @@ module RightScale
     def continue_result(*args) OperationResult.continue(*args) end
     def retry_result(*args) OperationResult.retry(*args) end
     def non_delivery_result(*args) OperationResult.non_delivery(*args) end
+    def cancel_result(*args) OperationResult.cancel(*args) end
     def result_from(*args) OperationResult.from_results(*args) end
 
   end # OperationResultHelper