stella 0.7.3.002 → 0.7.4.001

data/CHANGES.txt

@@ -1,5 +1,14 @@
 STELLA, CHANGES
 
+#### 0.7.4 (2009-11-11) ###############################
+
+* FIXED: Proper handling for timeout errors
+* CHANGE: Log directory is now YYYYMMDD-HH-mm-ss-SHA1
+* ADDED: Logging to .stella/log
+* ADDED: Global variables via --var
+* ADDED: Using naive CSV parsing via quickcsv (CSV lib is slooow for large files)
+* ADDED: Testplan file cache (load a file only once)
+
 
 #### 0.7.3 (2009-10-30) ###############################
 

data/bin/stella

@@ -13,8 +13,8 @@
 # 
 #     $ stella -h
 #     $ stella verify -p plans/basic.rb http://test.example.com/
-#     $ stella load -u 10 -t 60 http://test.example.com/
-#     $ stella load -u 10 -r 40 -p plans/basic.rb http://test.example.com/
+#     $ stella generate -u 10 -t 60 http://test.example.com/
+#     $ stella generate -u 10 -r 40 -p plans/basic.rb http://test.example.com/
 #
 #--
 
@@ -38,6 +38,15 @@ class Stella::CLI::Definition
   
   #global :A, :apikey, String, "API Key"
   #global :S, :secret, String, "Secret Key"
+  global :o, :output, String, "Write output to the given file" do |v|
+    String.disable_color
+    Stella.log.output = v
+  end
+  global :var, String, 'Set an arbitrary variable (--var "name=v")' do |var|
+    n, v = *var.split('=')
+    raise "Bad variable format: #{var}" if n.nil? || !n.match(/[a-z]+/i)
+    eval "$#{n} = '#{v}'"
+  end
   global :p, :pause, Integer, "Seconds to pause before starting test"
   global :E, :engine, String, "Specify a load engine (experimental)"
   global :n, :nocolor, "Disable output colors" do
@@ -51,8 +60,13 @@ class Stella::CLI::Definition
     Stella.enable_debug
   end
   global :v, :verbose, "Increase verbosity of output (e.g. -v or -vv or -vvv)" do
-    Stella.loglev += 1
+    Stella.stdout.lev += 1
   end
+  global :'disable-stats', "Disable stat collection"
+  global :'disable-logging', "Disable all logging" do
+    Stella::Logger.disable!
+  end
+  global :'disable-templates', "Disable template parsing"
   global :V, :version, "Display version number" do
     puts "Stella version: #{Stella::VERSION} (#{Stella::VERSION::PATCH})"
     exit 0
@@ -65,6 +79,10 @@ class Stella::CLI::Definition
   usage "stella example"
   command :example => Stella::CLI
   
+  about "View Stella configuration"
+  usage "stella config"
+  command :config => Stella::CLI
+  
   about "Preview a test plan"
   usage "stella preview [-p path/2/testplan.rb] "
   option :c, :clients, Integer, "Maximum number of virtual clients (ignored)"
@@ -103,9 +121,7 @@ class Stella::CLI::Definition
   option :w, :wait, Float, "Wait time (in seconds) between client requests (ignored if testplan supplied)"
   option :p, :testplan, String, "Path to testplan" 
   option :a, :arrival, Float, "Arrival rate (new clients per second)"
-  option :'disable-templates', "Disable template parsing"
   command :generate => Stella::CLI
-
   about "Initialize Stella configuration"
   command :init do
     Stella::Config.init
@@ -135,11 +151,9 @@ class Stella::CLI::Definition
   end
 
   after do |obj|  
-    Stella.lflush
     @elapsed = Time.now - @start
-    if Stella.loglev > 1 && @elapsed > 0.1
-      puts
-      puts "Elapsed: %.2f seconds" % @elapsed.to_f
+    if @elapsed > 0.1
+      Stella.stdout.puts 2, "#{$/}Elapsed: %.2f seconds" % @elapsed.to_f
     end
     code = obj.exit_code if obj.respond_to? :exit_code
     exit code ||= 0
@@ -158,11 +172,11 @@ rescue Drydock::UnknownCommand => ex
   STDERR.puts "Unknown command: %s" % ex.name
 rescue Stella::Error => ex
   STDERR.puts ex.message
-  STDERR.puts ex.backtrace if Stella.loglev > 2 || Drydock.debug?
+  STDERR.puts ex.backtrace if Stella.stdout.lev > 2 || Stella.debug?
 rescue Interrupt
-  puts "#{$/}Exiting... "
+  puts $/, "Exiting... "
   exit 1
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
-  STDERR.puts ex.backtrace if Stella.loglev > 2 || Drydock.debug?
+  STDERR.puts ex.backtrace if Stella.stdout.lev > 2 || Stella.debug?
 end

data/examples/cookies/plan.rb

@@ -7,7 +7,6 @@
 desc "Maintain Your Cookies"
 
 usecase 65, "Simple search" do
-  
   get "/", "Homepage"
   
   get "/search", "Search Results" do

data/examples/essentials/plan.rb

@@ -156,7 +156,7 @@ usecase 65, "Simple search" do
       set :lid, listing['id'].match(/(\d+)/)[0]
     end
     response 404 do 
-      quit "No results"
+      fail "No results"
     end
   end
   

data/lib/stella.rb

@@ -10,53 +10,62 @@ autoload :Drydock, 'drydock'
 autoload :URI, 'uri'
 autoload :OpenStruct, 'ostruct'
 autoload :Storable, 'storable'
-autoload :Gibbler, 'gibbler/aliases'
 autoload :Attic, 'attic'
 autoload :ERB, 'erb'
 
+require 'gibbler/aliases'  # important for run time digests and freezes
 require 'benelux'
 
+module Stella
+  module VERSION
+    unless defined?(MAJOR)
+      MAJOR = 0.freeze
+      MINOR = 7.freeze
+      TINY  = 4.freeze
+      PATCH = '001'.freeze 
+    end
+    def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
+    def self.to_f; self.to_s.to_f; end
+    def self.patch; PATCH; end
+  end
+end
+
+
+module Stella
+  class Error < RuntimeError
+    def initialize(obj=nil); @obj = obj; end
+    def message; @obj; end
+  end
+  class WackyRatio < Stella::Error; end
+  class WackyDuration < Stella::Error; end
+  class InvalidOption < Stella::Error; end
+  class NoHostDefined < Stella::Error; end
+end
+
+
 module Stella
   extend self
   
-  SLEEP_METRICS = {
-    :create_thread     => 0.001,
-    :check_threads     => 0.0005
-  }.freeze unless defined?(SLEEP_METRICS)
-    
+  require 'stella/logger'
+  
+  START_TIME = Time.now.freeze
+  
+  @globals = {}
   @sysinfo = nil
-  @logger  = Drydock::Screen
-  @loglev  = 1
   @debug   = false
   @abort   = false
-  
+  @quiet   = false
+  @log     = Stella::SyncLogger.new
+  @stdout  = Stella::Logger.new STDOUT
+    
   class << self
-    attr_accessor :loglev, :logger
-  end
-  
-  def sleep(metric)
-    unless SLEEP_METRICS.has_key? metric
-      raise "unknown sleep metric: #{metric}" 
-    end
-    Kernel.sleep SLEEP_METRICS[metric]
+    attr_accessor :log, :stdout
   end
-  
-  # Puts +msg+ to +@logger+
-  def lflush; @logger.flush if @logger.respond_to? :flush; end
-  def li(*msg); msg.each { |m| @logger.puts m } if !quiet? end
-  def li1(*msg); li *msg if @loglev >= 1 end
-  def li2(*msg); li *msg if @loglev >= 2 end
-  def li3(*msg); li *msg if @loglev >= 3 end
-  def li4(*msg); li *msg if @loglev >= 4 end
-  
-  # Puts +msg+ to +@logger+ with "ERROR: " prepended
-  def le(*msg); @logger.puts "  " << msg.join("#{$/}  ").color(:red); end
-  # Puts +msg+ to +@logger+ if +Rudy.debug?+ returns true
+
+  def le(*msg); stdout.info "  " << msg.join("#{$/}  ").color(:red); end
   def ld(*msg)
-    if debug?
-      @logger.puts "D(#{Thread.current.object_id}):  " << msg.join("#{$/}D:  ")
-      Stella.lflush
-    end
+    return unless Stella.debug?
+    Stella.stdout.info "D(#{Thread.current.object_id}):  " << msg.join("#{$/}D:  ")
   end
   
   def sysinfo
@@ -64,10 +73,6 @@ module Stella
     @sysinfo 
   end
   
-  def quiet?()        @loglev == 0    end
-  def enable_quiet()  @loglev =  0    end
-  def disable_quiet() @loglev =  1    end
-
   def debug?()        @debug == true  end
   def enable_debug()  @debug =  true  end
   def disable_debug() @debug =  false end
@@ -75,16 +80,24 @@ module Stella
   def abort?()        @abort == true  end
   def abort!()        @abort =  true  end
   
+  def quiet?()        @quiet == true  end
+  def enable_quiet()  @quiet = true   end
+  def disable_quiet() @quiet = false  end
+  
+  def add_global(n,v)
+    Stella.ld "SETGLOBAL: #{n}=#{v}"
+    @globals[n.strip] = v.strip
+  end
+  
   def rescue(&blk)
     blk.call
   rescue => ex
-    Stella.le "ERROR: #{ex.message}"
-    Stella.li3 ex.backtrace
+    Stella.stdout.info "ERROR: #{ex.message}"
+    Stella.stdout.info ex.backtrace
   end
   
-  require 'stella/exceptions'
+  require 'stella/common'
   
-  autoload :VERSION, 'stella/version'
   autoload :Utils, 'stella/utils'
   autoload :Config, 'stella/config'
   autoload :Data, 'stella/data'
@@ -92,9 +105,12 @@ module Stella
   autoload :Engine, 'stella/engine'
   autoload :Client, 'stella/client'
   
-  require 'stella/mixins'
 end
 
+Stella.stdout.lev = Stella.quiet? ? 0 : 1
+Stella.stdout.autoflush!
+
+
 
 
 

data/lib/stella/cli.rb

@@ -7,6 +7,10 @@ class Stella::CLI < Drydock::Command
     @exit_code = 0
   end
   
+  def config
+    puts @conf.to_yaml
+  end
+  
   def verify_valid?
     create_testplan
   end
@@ -26,15 +30,19 @@ class Stella::CLI < Drydock::Command
   def generate
     opts = {}
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :duration, :arrival, :'disable-templates'].each do |opt|
+    [:nowait, :clients, :repetitions, :duration, :arrival].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
-    
+    [:'disable-templates', :'disable-stats'].each do |opt|
+      opts[opt] = @global.send(opt) unless @global.send(opt).nil?
+    end
     case @global.engine
     when "package"
       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
@@ -68,7 +76,7 @@ class Stella::CLI < Drydock::Command
   
   def preview
     create_testplan
-    Stella.li @testplan.pretty(Stella.loglev > 1)
+    Stella.stdout.info @testplan.pretty(Stella.stdout.lev > 1)
   end
   
   private
@@ -89,7 +97,7 @@ class Stella::CLI < Drydock::Command
     end
     @testplan.check!  # raise errors, update usecase ratios
     @testplan.freeze  # cascades through usecases and requests
-    Stella.li2 " #{@option.testplan || @testplan.desc} (#{@testplan.digest})" 
+    Stella.stdout.info2 " #{@option.testplan || @testplan.desc} (#{@testplan.digest})" 
     true
   end
   

data/lib/stella/client.rb

@@ -5,7 +5,7 @@ Stella::Utils.require_vendor "httpclient", '2.1.5.2'
 
 module Stella
   class Client
-    require 'stella/client/modifiers'
+    
     require 'stella/client/container'
     
     include Gibbler::Complex
@@ -58,18 +58,19 @@ module Stella
           user, pass = http_auth.user, http_auth.pass
           user = container.instance_eval &user if Proc === user
           pass = container.instance_eval &pass if Proc === pass
-          Stella.li3 "  AUTH   (#{http_auth.kind}) #{domain} (#{user}/#{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, self.digest_cache, req.digest_cache, params, headers, counter].gibbler
+        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
         
-        params['__stella'] = headers['X-Stella-ID']= stella_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
@@ -77,6 +78,7 @@ module Stella
         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)
           Benelux.add_thread_tags :status => container.status
           res = container.response
           [
@@ -93,35 +95,35 @@ module Stella
           container.assets.each do |uri|
             Benelux.add_thread_tags :asset => uri
             a = http_client.get uri
-            Stella.li3 "   FETCH ASSET: #{uri} #{a.status}"
+            Stella.stdout.info3 "   FETCH ASSET: #{uri} #{a.status}"
             Benelux.remove_thread_tags :asset
           end
           asset_duration = Time.now - asset_start
-          
+        rescue HTTPClient::ConnectTimeoutError => ex
+          update(:request_timeout, usecase, uri, req, params, headers, counter, container)
         rescue => ex
-          Benelux.thread_timeline.add_count :failed, 1
-          update(:request_error, usecase, uri, req, params, 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
         end
         
-        Stella.lflush
-        
         run_sleeper(req.wait, asset_duration) if req.wait != 0 && !nowait?
         
         # TODO: consider throw/catch
         case ret.class.to_s
         when "Stella::Client::Repeat"
+          update(:request_repeat, counter, ret.times+1, uri, container)
           Benelux.remove_thread_tags :status
-          update(:repeat_request, counter, ret.times+1)
           redo if counter <= ret.times
         when "Stella::Client::Quit"
+          update(:usecase_quit, ret.message, uri, container)
           Benelux.remove_thread_tags :status
-          update(:quit_usecase, ret.message)
           break
         when "Stella::Client::Fail"  
-          Benelux.thread_timeline.add_count :failed, 1
-          update(:fail_request, ret.message)
+          update(:request_fail, ret.message, uri, container)
+        when "Stella::Client::Error"  
+          update(:request_error, ret.message, uri, container)
         end
         
         Benelux.remove_thread_tags :status
@@ -137,9 +139,9 @@ module Stella
     def nowait?; @nowait == true; end
       
   private
+    # We use a method so we can time it with Benelux
     def send_request(http_client, usecase, meth, uri, req, params, headers, container, counter)
       container.response = http_client.send(meth, uri, params, headers) # booya!
-      update(:receive_response, usecase, uri, req, params, counter, container)
     end
     
     def update(kind, *args)
@@ -168,7 +170,7 @@ module Stella
       }
       http_client = HTTPClient.new opts
       http_client.set_proxy_auth(@proxy.user, @proxy.pass) if @proxy.user
-      http_client.debug_dev = STDOUT if Stella.debug? && Stella.loglev > 3
+      http_client.debug_dev = STDOUT if Stella.debug? && Stella.stdout.lev > 3
       http_client.protocol_version = "HTTP/1.1"
       http_client.ssl_config.verify_mode = ::OpenSSL::SSL::VERIFY_NONE
       http_client
@@ -268,7 +270,9 @@ module Stella
       ret = nil
       handler = find_response_handler container, req
       if handler.nil?
-        Benelux.thread_timeline.add_count :failed, 1 if container.status >= 400
+        if container.status >= 400
+          update(:request_fail, "No handler", req.uri, container) 
+        end
         return
       end
       begin
@@ -293,4 +297,25 @@ module Stella
     end
     
   end
-end
+end
+
+
+class Stella::Client
+  
+  class ResponseModifier
+    attr_accessor :message
+    def initialize(msg=nil)
+      @message = msg
+    end 
+  end
+  class Repeat < ResponseModifier; 
+    attr_accessor :times
+    def initialize(times)
+      @times = times
+    end
+  end
+  class Quit < ResponseModifier; end
+  class Fail < Quit; end
+  class Error < Quit; end
+  
+end