stella 0.7.4.001 → 0.7.5.001

data/CHANGES.txt

@@ -1,5 +1,18 @@
 STELLA, CHANGES
 
+
+#### 0.7.5 (2009-11-16) ###############################
+
+* FIXED: Correctly capture exceptions in Client
+* FIXED: Issue with printing the dot (.) for the start of every usecase
+* FIXED: Stats samples not cleared between background calculations
+* CHANGE: Do not include testplan, usecase, or request descriptions in digest calculation
+* CHANGE: Use 6 digit digest in log directory names
+* CHANGE: Client aborts usecase on unhandled exceptions
+* ADDED: Support for $perlstyle variables in config
+* ADDED: Print log dir below summary report
+
+
 #### 0.7.4 (2009-11-11) ###############################
 
 * FIXED: Proper handling for timeout errors

data/lib/stella.rb

@@ -21,7 +21,7 @@ module Stella
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 4.freeze
+      TINY  = 5.freeze
       PATCH = '001'.freeze 
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
@@ -65,7 +65,8 @@ module Stella
   def le(*msg); stdout.info "  " << msg.join("#{$/}  ").color(:red); end
   def ld(*msg)
     return unless Stella.debug?
-    Stella.stdout.info "D(#{Thread.current.object_id}):  " << msg.join("#{$/}D:  ")
+    prefix = "D(#{Thread.current.object_id}):  "
+    Stella.stdout.info "#{prefix}" << msg.join("#{$/}#{prefix}")
   end
   
   def sysinfo
@@ -92,8 +93,8 @@ module Stella
   def rescue(&blk)
     blk.call
   rescue => ex
-    Stella.stdout.info "ERROR: #{ex.message}"
-    Stella.stdout.info ex.backtrace
+    Stella.le "ERROR: #{ex.message}"
+    Stella.ld ex.backtrace
   end
   
   require 'stella/common'

data/lib/stella/cli.rb

@@ -41,8 +41,6 @@ class Stella::CLI < Drydock::Command
       ret = Stella::Engine::LoadPackage.run @testplan, opts
     when "create" 
       ret = Stella::Engine::LoadCreate.run @testplan, opts
-    when "redis" 
-      ret = Stella::Engine::LoadRedis.run @testplan, opts
     else 
       ret = Stella::Engine::LoadQueue.run @testplan, opts
     end

data/lib/stella/client.rb

@@ -40,42 +40,50 @@ module Stella
         stats ||= Benelux::Stats.new
         update(:prepare_request, usecase, req, counter)
         
-        # This is for the values that were "set"
-        # in the part before the response body.
-        prepare_resources(container, req.resources)
+        begin
+          # This is for the values that were "set"
+          # in the part before the response body.
+          prepare_resources(container, req.resources)
         
-        params = prepare_params(container, req.params)
-        headers = prepare_headers(container, req.headers)
+          params = prepare_params(container, req.params)
+          headers = prepare_headers(container, req.headers)
         
-        container.params, container.headers = params, headers
+          container.params, container.headers = params, headers
         
-        uri = build_request_uri req.uri, params, container
+          uri = build_request_uri req.uri, params, container
         
-        if http_auth = usecase.http_auth || req.http_auth
-          # TODO: The first arg is domain and can include a URI path. 
-          #       Are there cases where this is important?
-          domain = '%s://%s%s' % [uri.scheme, uri.host, '/'] #File.dirname(uri.path)
-          user, pass = http_auth.user, http_auth.pass
-          user = container.instance_eval &user if Proc === user
-          pass = container.instance_eval &pass if Proc === pass
-          update(:authenticate, usecase, req, http_auth.kind, domain, user, pass)
-          http_client.set_auth(domain, user, pass)
-        end
+          if http_auth = usecase.http_auth || req.http_auth
+            # TODO: The first arg is domain and can include a URI path. 
+            #       Are there cases where this is important?
+            domain = '%s://%s%s' % [uri.scheme, uri.host, '/'] #File.dirname(uri.path)
+            user, pass = http_auth.user, http_auth.pass
+            user = container.instance_eval &user if Proc === user
+            pass = container.instance_eval &pass if Proc === pass
+            update(:authenticate, usecase, req, http_auth.kind, domain, user, pass)
+            http_client.set_auth(domain, user, pass)
+          end
         
-        raise NoHostDefined, req.uri if uri.host.nil? || uri.host.empty?
-        stella_id = [Time.now.to_f, self.digest_cache, req.digest_cache, params, headers, counter].gibbler
+          raise NoHostDefined, req.uri if uri.host.nil? || uri.host.empty?
+          stella_id = [Time.now.to_f, self.digest_cache, req.digest_cache, params, headers, counter].gibbler
         
-        Benelux.add_thread_tags :request => req.digest_cache
-        Benelux.add_thread_tags :retry => counter
-        Benelux.add_thread_tags :stella_id => stella_id
+          Benelux.add_thread_tags :request => req.digest_cache
+          Benelux.add_thread_tags :retry => counter
+          Benelux.add_thread_tags :stella_id => stella_id
         
-        container.unique_id = stella_id
-        params['__stella'] = headers['X-Stella-ID'] = container.unique_id[0..10]
+          container.unique_id = stella_id
+          params['__stella'] = headers['X-Stella-ID'] = container.unique_id[0..10]
         
-        meth = req.http_method.to_s.downcase
-        Stella.ld "#{req.http_method}: " << "#{req.uri} " << params.inspect
+          meth = req.http_method.to_s.downcase
+          Stella.ld "#{req.http_method}: " << "#{req.uri} " << params.inspect
+        
+          ret, asset_duration = nil, 0
+        rescue => ex
+          update(:request_unhandled_exception, usecase, uri, req, params, ex)
+          update(:usecase_error, ex.message, uri, container)
+          Benelux.remove_thread_tags :status, :retry, :request, :stella_id
+          break
+        end
         
-        ret, asset_duration = nil, 0
         begin
           send_request http_client, usecase, meth, uri, req, params, headers, container, counter
           update(:receive_response, usecase, uri, req, params, headers, counter, container)
@@ -101,8 +109,8 @@ module Stella
           asset_duration = Time.now - asset_start
         rescue HTTPClient::ConnectTimeoutError => ex
           update(:request_timeout, usecase, uri, req, params, headers, counter, container)
+          Benelux.remove_thread_tags :status, :retry, :request, :stella_id
         rescue => ex
-          #p "111111111111111111111111#{ex.class}: #{ex.message}"
           update(:request_unhandled_exception, usecase, uri, req, params, ex)
           Benelux.remove_thread_tags :status, :retry, :request, :stella_id
           next
@@ -210,14 +218,13 @@ module Stella
     def build_request_uri(uri, params, container)
       newuri = uri.clone  # don't modify uri template
       # We call uri.clone b/c we modify uri. 
-      uri.scan(/:([a-z_]+)/i) do |instances|
-        instances.each do |varname|
-          val = find_replacement_value(varname, params, container, base_uri)
-          #Stella.ld "FOUND: #{val}"
-          newuri.gsub! /:#{varname}/, val.to_s unless val.nil?
-        end
+      uri.scan(/([:\$])([a-z_]+)/i) do |inst|
+        val = find_replacement_value(inst[1], params, container, base_uri)
+        Stella.ld "FOUND VAR: #{inst[0]}#{inst[1]} (value: #{val})"
+        re = Regexp.new "\\#{inst[0]}#{inst[1]}"
+        newuri.gsub! re, val.to_s unless val.nil?
       end
-      
+
       uri = URI.parse(newuri)
       
       if uri.host.nil? && base_uri.nil?

data/lib/stella/data/http.rb

@@ -14,7 +14,7 @@ module Stella::Data::HTTP
       #
     attr_accessor :response_handler
     
-    field :desc
+    field :description
     field :header 
     field :uri
     field :wait
@@ -25,6 +25,8 @@ module Stella::Data::HTTP
     field :content_type
     field :http_auth
     
+    attic :description
+    
     def has_body?
       !@body.nil?
     end
@@ -35,7 +37,7 @@ module Stella::Data::HTTP
       @headers, @params, @response_handler = {}, {}, {}
       @resources = {}
       @wait = 0
-      @desc = "Request"
+      self.description = "Request"
       instance_eval &definition unless definition.nil?
     end
     
@@ -45,8 +47,8 @@ module Stella::Data::HTTP
     end
     
     def desc(*args)
-      @desc = args.first unless args.empty?
-      @desc
+      self.description = args.first unless args.empty?
+      self.description
     end
     
     def content_type(*args)

data/lib/stella/engine.rb

@@ -25,7 +25,7 @@ module Stella::Engine
     
     def log_dir(plan, file=nil)
       stamp = Stella::START_TIME.strftime("%Y%m%d-%H-%M-%S")
-      stamp <<"-#{plan.digest.short}"
+      stamp <<"-#{plan.digest.shorter}"
       #stamp << "STAMP"
       l = File.join Stella::Config.project_dir, 'log', stamp
       FileUtils.mkdir_p l unless File.exists? l
@@ -86,7 +86,6 @@ module Stella::Engine
   autoload :LoadPackage, 'stella/engine/load_package'
   autoload :LoadCreate, 'stella/engine/load_create'
   autoload :LoadQueue, 'stella/engine/load_queue'
-  autoload :LoadRedis, 'stella/engine/load_redis'
   
   # These timers are interesting from a reporting perspective.
   Benelux.add_counter    Stella::Client, :execute_response_handler

data/lib/stella/engine/load_queue.rb

@@ -24,8 +24,8 @@ module Stella::Engine
 
           # This thread will stay on this one track. 
           Benelux.current_track c.digest
-          Benelux.add_thread_tags :usecase => uc.digest_cache
           
+          Benelux.add_thread_tags :usecase => uc.digest_cache
           Thread.current[:real_uctime].first_tick
           prev_ptime ||= Time.now
           reps.times { |rep| 
@@ -38,7 +38,7 @@ module Stella::Engine
             #Stella.stdout.info [package.client.gibbler.shorter, package.usecase.gibbler.shorter, rep].inspect
             Stella::Engine::Load.rescue(c.digest_cache) {
               break if Stella.abort?
-              Stella.stdout.print! 2, '.'
+              print '.' if Stella.stdout.lev == 2
               stats = c.execute uc
             }
             Benelux.remove_thread_tags :rep

data/lib/stella/engine/loadbase.rb

@@ -7,9 +7,10 @@ module Stella::Engine
     @timers = [:do_request]
     @counts = [:response_content_size]
     @reqlog = nil
+    @logdir = nil
     
     class << self
-      attr_accessor :timers, :counts
+      attr_accessor :timers, :counts, :logdir
     end
     
     def run(plan, opts={})
@@ -17,13 +18,13 @@ module Stella::Engine
       opts = process_options! plan, opts
       @threads, @max_clients, @real_reps = [], 0, 0
       
-      d = log_dir(plan)
-      latest = File.join(File.dirname(d), 'latest')
-      Stella.stdout.info "Logging to #{d}", $/
+      @logdir = log_dir(plan)
+      latest = File.join(File.dirname(@logdir), 'latest')
+      Stella.stdout.info "Logging to #{@logdir}", $/
       
       if Stella.sysinfo.os == :unix
         File.unlink latest if File.exists? latest
-        FileUtils.ln_sf File.basename(d), latest
+        FileUtils.ln_sf File.basename(@logdir), latest
       end
 
       @reqlog = Stella::Logger.new log_path(plan, 'requests')
@@ -39,8 +40,7 @@ module Stella::Engine
       @plalog.info(plan.pretty.noansi) and @plalog.close
       
       
-      Stella.stdout.add_template :head1, '%s (%s)'
-      Stella.stdout.add_template :head2, '  %s: %s'
+      Stella.stdout.add_template :head, '  %s: %s'
       Stella.stdout.add_template :status,  "#{$/}%s..."
       
       @sumlog.add_template :dsummary, '%20s: %8d'
@@ -69,9 +69,9 @@ module Stella::Engine
         timing = "#{opts[:repetitions]} repetitions"
       end
       
-      Stella.stdout.head1 plan.desc, plan.digest.short
-      Stella.stdout.head2 'Clients', counts[:total]
-      Stella.stdout.head2 'Limit', timing
+      Stella.stdout.head 'Plan', "#{plan.desc} (#{plan.digest.shorter})"
+      Stella.stdout.head 'Clients', counts[:total]
+      Stella.stdout.head 'Limit', timing
       
       @dumper.start
       
@@ -79,7 +79,7 @@ module Stella::Engine
         @optlog.head "START", Time.now.to_s
         Stella.stdout.status "Running" 
         execute_test_plan packages, opts[:repetitions], opts[:duration], opts[:arrival]
-        Stella.stdout.info "Done" 
+        Stella.stdout.info $/, "Done" 
       rescue Interrupt
         Stella.stdout.nstatus "Stopping test"
         Stella.abort!
@@ -127,6 +127,8 @@ module Stella::Engine
       # DNE:
       #p [@real_reps, total.n]
       
+      Stella.stdout.info $/, "Log dir: #{@logdir}"
+      
       failed.n == 0
     end
     
@@ -142,14 +144,13 @@ module Stella::Engine
     
     def prepare_dumper(plan, opts)
       Stella::Hand.new(15.seconds, 2.seconds) do
-        Benelux.update_global_timeline
+        Benelux.update_global_timeline 
         #reqlog.info [Time.now, Benelux.timeline.size].inspect
         @reqlog.info Benelux.timeline.messages.filter(:kind => :request)
         @failog.info Benelux.timeline.messages.filter(:kind => :exception)
         @failog.info Benelux.timeline.messages.filter(:kind => :timeout)
         @authlog.info Benelux.timeline.messages.filter(:kind => :authentication)
         @reqlog.clear and @failog.clear and @authlog.clear
-        #generate_runtime_report(plan)
         Benelux.timeline.clear if opts[:"disable-stats"]
       end
 
@@ -223,7 +224,6 @@ module Stella::Engine
     end
         
     def generate_report(sumlog,plan,test_time)
-      #Benelux.update_all_track_timelines
       global_timeline = Benelux.timeline
       global_stats = global_timeline.stats.group(:do_request).merge
       if global_stats.n == 0
@@ -231,6 +231,8 @@ module Stella::Engine
         return
       end
       
+      
+      
       @sumlog.info " %-72s  ".att(:reverse) % ["#{plan.desc}  (#{plan.digest_cache.shorter})"]
       plan.usecases.uniq.each_with_index do |uc,i| 
         
@@ -350,16 +352,22 @@ module Stella::Engine
     
     def update_error_execute_response_handler(client_id, ex, req, container)
       desc = "#{container.usecase.desc} > #{req.desc}"
-      Stella.stdout.info $/ if Stella.stdout.lev == 1
-      Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.stdout.info ex.backtrace
+      if Stella.stdout.lev == 2
+        Stella.stdout.print 2, '.'.color(:red)
+      else
+        Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
+        Stella.ld ex.backtrace
+      end
     end
     
     def update_request_unhandled_exception(client_id, usecase, uri, req, params, ex)
       desc = "#{usecase.desc} > #{req.desc}"
-      Stella.stdout.info $/ if Stella.stdout.lev == 1
-      Stella.stdout.info '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.stdout.info ex.backtrace
+      if Stella.stdout.lev == 2
+        Stella.stdout.print 2, '.'.color(:red)
+      else
+        Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
+        Stella.ld ex.backtrace
+      end
     end
 
     def update_usecase_quit client_id, msg, req, container
@@ -383,7 +391,9 @@ module Stella::Engine
       Benelux.thread_timeline.add_count :error, 1
       args.push [req, container.status, 'ERROR', msg, container.unique_id[0,10]]
       Benelux.thread_timeline.add_message args.join('; '), :kind => :exception
-      Stella.stdout.info3 '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
+      if Stella.stdout.lev >= 3
+        Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
+      end
     end
     
     def update_request_repeat client_id, counter, total, req, container
@@ -407,8 +417,8 @@ module Stella::Engine
     def self.rescue(client_id, &blk)
       blk.call
     rescue => ex
-      Stella.stdout.info '  Error in Client-%s: %s' % [client_id.shorter, ex.message]
-      puts ex.backtrace
+      Stella.le '  Error in Client-%s: %s' % [client_id.shorter, ex.message]
+      Stella.ld ex.backtrace
     end
     
     Benelux.add_timer Stella::Engine::Load, :build_thread_package

data/lib/stella/logger.rb

@@ -40,10 +40,6 @@ module Stella
       flush if autoflush?
       true
     end
-    def print!(level, msg)
-      return unless @lev == level
-      print level, msg
-    end
     
     def puts(level, *msg)
       return if level > @lev || Logger.disabled?
@@ -83,6 +79,7 @@ module Stella
       end
     end
     
+    # TODO: There's a big when using print (no newline)
     def flush
       return if Logger.disabled?
       @mutex.synchronize do

data/lib/stella/testplan.rb

@@ -1,4 +1,5 @@
 autoload :CSV, 'csv'
+#Gibbler.enable_debug
 
 module Stella
 class Testplan
@@ -21,13 +22,14 @@ class Testplan
   
   attic :base_path
   attic :plan_path
+  attic :description
   
   attr_accessor :usecases
-  attr_accessor :desc
   attr_reader :stats
   
   def initialize(uris=[], opts={})
-    @desc, @usecases = "Test plan", []
+    self.description = "Test plan"
+    @usecases = []
     @testplan_current_ratio = 0
     @stats = Stella::Testplan::Stats.new
 
@@ -62,8 +64,6 @@ class Testplan
     needy.each do |u|
       u.ratio = (remaining_ratio / needy.size).to_f
     end
-    # Give usecases a name if necessary
-    @usecases.each_with_index { |uc,i| uc.desc ||= "Usecase ##{i+1}" }
     if @testplan_current_ratio > 1.0 
       msg = "Usecase ratio cannot be higher than 1.0"
       msg << " (#{@testplan_current_ratio})"
@@ -73,45 +73,49 @@ class Testplan
   
   # make sure all clients share identical test plans
   def freeze
-    Stella.ld "FREEZE TESTPLAN: #{desc}"
+    Stella.ld "FREEZE TESTPLAN: #{self.description}"
     @usecases.each { |uc| uc.freeze }
     super
     self
   end
   
   def usecase(*args, &blk)
-    return @usecases if args.empty?
+    return @usecases if args.empty? && blk.nil?
     ratio, name = nil,nil
-    ratio, name = args[0], args[1] if args[0].is_a?(Numeric)
-    ratio, name = args[1], args[0] if args[0].is_a?(String)
+    unless args.empty?
+      ratio, name = args[0], args[1] if args[0].is_a?(Numeric)
+      ratio, name = args[1], args[0] if args[0].is_a?(String)
+    end
     uc = Stella::Testplan::Usecase.new
     uc.base_path = self.base_path
     uc.plan_path = self.plan_path
     uc.instance_eval &blk
-    uc.ratio, uc.desc = (ratio || -1).to_f, name
+    uc.ratio = (ratio || -1).to_f
+    uc.description = name unless name.nil?
     @testplan_current_ratio += uc.ratio if uc.ratio > 0
     add_usecase uc
   end
   def xusecase(*args, &blk); Stella.ld "Skipping usecase"; end
   
   def add_usecase(uc)
-    Stella.ld "Usecase: #{uc.desc}"
+    Stella.ld "Usecase: #{uc.description}"
     @usecases << uc
     uc
   end
   
+  # for DSL use-only (otherwise use: self.description)
   def desc(*args)
-    @desc = args.first unless args.empty?
-    @desc
+    self.description = args.first unless args.empty?
+    self.description
   end
 
   def pretty(long=false)
     str = []
     dig = long ? self.digest_cache : self.digest_cache.shorter
-    str << " %-66s  ".att(:reverse) % ["#{@desc}  (#{dig})"]
+    str << " %-66s  ".att(:reverse) % ["#{self.description}  (#{dig})"]
     @usecases.each_with_index do |uc,i| 
       dig = long ? uc.digest_cache : uc.digest_cache.shorter
-      desc = uc.desc || "Usecase ##{i+1}"
+      desc = uc.description || "Usecase ##{i+1}"
       desc += "  (#{dig}) "
       str << (' ' << " %-61s %s%% ".att(:reverse).bright) % [desc, uc.ratio_pretty]
       unless uc.http_auth.nil?
@@ -119,7 +123,7 @@ class Testplan
       end
       requests = uc.requests.each do |r| 
         dig = long ? r.digest_cache : r.digest_cache.shorter
-        str << "    %-62s".bright % ["#{r.desc}  (#{dig})"]
+        str << "    %-62s".bright % ["#{r.description}  (#{dig})"]
         str << "      %s" % [r]
         if Stella.stdout.lev > 2
           [:wait].each { |i| str << "      %s: %s" % [i, r.send(i)] }
@@ -166,8 +170,9 @@ class Testplan
     
     attic :base_path # we don't want gibbler to see this
     attic :plan_path
+    attic :description
+    
     
-    attr_accessor :desc
     attr_writer :ratio
     attr_reader :http_auth
     
@@ -184,8 +189,8 @@ class Testplan
     end
     
     def desc(*args)
-      @desc = args.first unless args.empty?
-      @desc
+      self.description = args.first unless args.empty?
+      self.description
     end
     
     def resource(name, value=nil)
@@ -248,7 +253,7 @@ class Testplan
     
     def add_request(meth, *args, &blk)
       req = Stella::Data::HTTP::Request.new meth.to_s.upcase, args[0], &blk
-      req.desc = args[1] if args.size > 1 # Description is optional
+      req.description = args[1] if args.size > 1 # Description is optional
       Stella.ld req
       @requests << req
       req

data/stella.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.4.001"
+  s.version = "0.7.5.001"
   s.summary = "Blame Stella for breaking your web applications."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,7 +15,7 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux',    '>= 0.5.2'
+  s.add_dependency 'benelux',    '>= 0.5.3'
   s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.7.1'
   s.add_dependency 'sysinfo',    '>= 0.7.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.4.001
+  version: 0.7.5.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.2
+        version: 0.5.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock