right_develop 3.1.9 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9bea4294ac48a9bb1c124143e96594b3993867c
-  data.tar.gz: 1817c459f9d80fea412f1e1e7a66c011c6629f0d
+  metadata.gz: ca1ee47286ed9116bc3e025b1596019d85b1b59c
+  data.tar.gz: 524daf75dc03226c0fa94d0c265dc494f24e7ac2
 SHA512:
-  metadata.gz: 814de826f973fd7678c8723ea686bebc140aa18e39497e7d77d683c208dc6dddaa8895ab0bf121400c0005862ba01b49806c2ee9462863d4be55d27b71d20b5c
-  data.tar.gz: 65416ad1cbe5429b1e74b842449b739992f9d1e2d32e53569c209932f6ab8204e43c1596e576ff290d7995d15d393e9bfc62d3057b50bb4d28d7691bb8443e7e
+  metadata.gz: 2264a0ad0de1f8cef1de281cca8d9ab688c3d2d14006d5a4225decb2cf7fd346cb67226832abee3933f43b65b9a5f157b5a121159d90591223a40b2ed05463a3
+  data.tar.gz: c00c17b93fb059d26181ebc335f25fcbecee4e8c7f0d0e7e6542a179b05a47ced720c0973e7ec9d8dc56ad1bf6a0e1801128b74b2afdfadcdcc07a70069251cc

data/VERSION

@@ -1 +1 @@
-3.1.9
+3.1.10

data/lib/right_develop/testing/clients/rest/requests/playback.rb

@@ -89,7 +89,7 @@ module RightDevelop::Testing::Client::Rest::Request
     end
 
     RETRY_DELAY = 0.5
-    MAX_RETRIES = 100  # = 50 seconds; a socket usually times out in 60-120 seconds
+    MAX_RETRIES = 240  # = 120 seconds; a socket usually times out in 60-120 seconds
 
     # Overrides transmit to catch halt thrown by log_request.
     #
@@ -176,7 +176,6 @@ module RightDevelop::Testing::Client::Rest::Request
       # allowed due to multithreaded requests causing the epoch to advance
       # (in a non-throttled playback) before all requests for a past epoch have
       # been made. the current epoch is always preferred over past.
-      logger.debug("BEGIN playback state = #{state.inspect}") if logger.debug?
       file_path = nil
       past_epochs = state[:past_epochs] ||= []
       try_epochs = [state[:epoch]] + past_epochs
@@ -203,11 +202,20 @@ module RightDevelop::Testing::Client::Rest::Request
           response_hash[:body])
         result = FakeNetHttpResponse.new(response_hash, response_metadata)
       else
-        msg = 'Unable to locate response file(s) in epoch range ' +
-              "[#{first_tried_epoch} - #{last_tried_epoch}]:\n  " +
-              first_tried_path.inspect
+        msg = <<EOF
+Unable to locate response file(s) in epoch range [#{first_tried_epoch} - #{last_tried_epoch}]:
+#{first_tried_path.inspect}
+request checksum_data = #{request_metadata.checksum_data.inspect}
+state = #{state.inspect}
+EOF
         raise PLAYBACK_ERROR, msg
       end
+
+      # defer any verbose debug logging (i.e. the current state) until after
+      # metadata has been successfully loaded because a retryable missing
+      # variable may occur a couple hundred times before the condition is
+      # satisfied, if ever.
+      logger.debug("BEGIN playback state = #{state.inspect}") if logger.debug?
       logger.debug("Played back response from #{file_path.inspect}.")
 
       # determine if epoch is done, which it is if every known request has been

data/lib/right_develop/testing/clients/rest/requests/record.rb

@@ -63,6 +63,23 @@ module RightDevelop::Testing::Client::Rest::Request
       def to_hash; @headers; end
     end
 
+    # Overrides transmit to catch halt thrown by log_request.
+    #
+    # @param [URI[ uri of some kind
+    # @param [Net::HTTP] req of some kind
+    # @param [RestClient::Payload] of some kind
+    #
+    # @return
+    def transmit(uri, req, payload, &block)
+      super
+    rescue ::Interrupt
+      if @request_timestamp
+        logger.warn('Interrupted with at least one request outstanding; will record a timeout response.')
+        handle_timeout
+      end
+      raise
+    end
+
     # Overrides log_request for basic logging.
     #
     # @param [RestClient::Response] to capture

data/lib/right_develop/testing/recording/metadata.rb

@@ -88,7 +88,7 @@ module RightDevelop::Testing::Recording
     class RecordingError < StandardError; end
     class PlaybackError < StandardError; end
 
-    attr_reader :uri, :verb, :http_status, :headers, :body
+    attr_reader :uri, :verb, :http_status, :headers, :body, :checksum_data
     attr_reader :mode, :logger, :effective_route_config, :variables
     attr_reader :typenames_to_values
 
@@ -636,8 +636,15 @@ module RightDevelop::Testing::Recording
         result = variable  # use macro as substituted value
       elsif values = @variables[variable]
         # quick out for same as initial value; don't show array index.
+        # special case for 'any_variable_name[*]' which always uses the last
+        # given value instead of keeping an array of values.
         if values.first == real_value
           result = variable
+        elsif variable.end_with?('[*]')
+          # special case for wildcard index; update 1-sized array 0th entry with
+          # latest value instead of appending a new unique value.
+          @variables[variable][0] = real_value
+          result = variable
         else
           # show zero-based array index beyond the zero index.
           unless value_index = values.index(real_value)
@@ -667,8 +674,17 @@ module RightDevelop::Testing::Recording
         end
         result = variable  # use macro as substituted value
       else
-        values = @variables[variable]
-        case value_index = values && values.index(real_value)
+        value_index = nil
+        if values = @variables[variable]
+          # special wildcard index notation means 'always latest value'; the
+          # recorded variable name will be the wildcard index name.
+          if variable.end_with?('[*]')
+            value_index = 0
+          else
+            value_index = values.index(real_value)
+          end
+        end
+        case value_index
         when nil
           message = 'A variable referenced by a response has not yet been ' +
                     'defined by a request while replacing variable = ' +
@@ -702,7 +718,10 @@ module RightDevelop::Testing::Recording
           raise PlaybackError, message
         end
       elsif variable_array = @variables[variable]
-        if matched = VARIABLE_INDEX_REGEX.match(target_value)
+        if variable.end_with?('[*]')
+          # special case for wildcard
+          variable_array_index = 0
+        elsif matched = VARIABLE_INDEX_REGEX.match(target_value)
           variable_array_index = Integer(matched[1])
         else
           variable_array_index = 0
@@ -791,12 +810,12 @@ module RightDevelop::Testing::Recording
       end
 
       # use deep-sorted JSON to prevent random ordering changing the checksum.
-      checksum_data = self.class.deep_sorted_json(significant_data)
+      @checksum_data = self.class.deep_sorted_json(significant_data)
       if logger.debug?
         logger.debug("#{@kind} significant = #{significant.inspect}")
-        logger.debug("#{@kind} checksum_data = #{checksum_data.inspect}")
+        logger.debug("#{@kind} checksum_data = #{@checksum_data.inspect}")
       end
-      ::Digest::MD5.hexdigest(checksum_data)
+      ::Digest::MD5.hexdigest(@checksum_data)
     end
 
     # Performs a selective copy of any significant fields (recursively) or else

data/lib/right_develop/testing/servers/might_api/app/base.rb

@@ -23,6 +23,7 @@
 require ::File.expand_path('../../config/init', __FILE__)
 
 require 'rack/chunked'
+require 'set'
 require 'stringio'
 require 'uri'
 
@@ -30,6 +31,8 @@ module RightDevelop::Testing::Server::MightApi
   module App
     class Base
 
+      MUTEX = ::Mutex.new  # semaphore for critical sections
+
       MAX_REDIRECTS = 10  # 500 after so many redirects
 
       # Rack (and Skeletor) apps and some known AWS apps only accept dash and
@@ -63,6 +66,18 @@ module RightDevelop::Testing::Server::MightApi
           nil
       end
 
+      def self.interrupted?
+        !!@interrupted
+      end
+
+      def self.interrupted=(value)
+        @interrupted = value
+      end
+
+      def self.app_threads
+        @app_threads ||= ::Set.new
+      end
+
       def call(env)
         # HACK: chain trap interrupt on first call to app because the trap chain
         # does not exist, in rack terms, until just before app is run.
@@ -75,7 +90,11 @@ module RightDevelop::Testing::Server::MightApi
         # cleaned-up on shutdown, etc. admin mode has a workaround whereby it is
         # able to clean-up any temporary files immediately after reading its
         # config and whenever the administered configuration changes.
-        entrapment unless Base.trapped?
+        raise ::Interrupt if self.class.interrupted?
+        MUTEX.synchronize do
+          entrapment unless Base.trapped?
+          self.class.app_threads << ::Thread.current
+        end
 
         env['rack.logger'] ||= logger
 
@@ -145,6 +164,13 @@ module RightDevelop::Testing::Server::MightApi
         logger.error(message)
         logger.debug(trace.join("\n"))
         internal_server_error(message)
+      rescue ::Interrupt
+        # setting interrupted=true may or may not be redundant, depending on
+        # visibility of interrupted flag to all outstanding app threads.
+        # the problem is that we are not allowed to synchronize a mutex inside
+        # of a trap context.
+        self.class.interrupted = true
+        internal_server_error('interrupt')
       rescue ::Exception => e
         message = "Unhandled exception: #{e.class} #{e.message}"
         trace = e.backtrace || []
@@ -156,6 +182,12 @@ module RightDevelop::Testing::Server::MightApi
           env['rack.errors'].puts(trace.join("\n"))
         end
         internal_server_error(message)
+      ensure
+        unless self.class.interrupted?
+          MUTEX.synchronize do
+            self.class.app_threads.delete(::Thread.current)
+          end
+        end
       end
 
       # Handler.
@@ -434,6 +466,22 @@ EOF
               app.logger.warn('cannot log traps')  # no exception raised
             end
 
+            # interrupt any running app threads to resolve outstanding requests.
+            #
+            # note that Mutex#synchronize is not allowed inside a trap context.
+            #
+            # FIX: duplicating the set is slightly unsafe but not sure how else
+            # to deal with data protected by critical section in a trap. we also
+            # have logic in ensure block to avoid modifying set on interrupt.
+            app.class.interrupted = true
+            app_threads = app.class.app_threads.dup
+            app_threads.each do |app_thread|
+              if app_thread.alive?
+                app_thread.raise(::Interrupt)
+                app_thread.join
+              end
+            end
+
             # cleanup fixtures, if requested.
             app.cleanup
             if previous_trap && previous_trap.respond_to?(:call)

data/right_develop.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_develop 3.1.9 ruby lib
+# stub: right_develop 3.1.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_develop"
-  s.version = "3.1.9"
+  s.version = "3.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro"]
-  s.date = "2014-12-01"
+  s.date = "2014-12-10"
   s.description = "A toolkit of development tools created by RightScale."
   s.email = "support@rightscale.com"
   s.executables = ["right_develop"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_develop
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support