stella 0.7.1 → 0.7.2

data/lib/stella/data/http/request.rb

@@ -32,6 +32,7 @@ module Stella::Data::HTTP
       @uri = uri_str
       @http_method, @http_version = method, version
       @headers, @params, @response_handler = {}, {}, {}
+      @resources = {}
       @wait = 0
       @desc = "Request"
       @body = Stella::Data::HTTP::Body.new
@@ -55,13 +56,30 @@ module Stella::Data::HTTP
     alias_method :sleep, :wait
     
     def headers(*args)
-      @headers.merge! args.first unless args.empty?
+      unless args.empty?
+        h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
+        @headers.merge! h unless h.empty?
+      end
       @headers
     end
     alias_method :header, :headers
     
+    # Set a resource key value pair in the get, post block.
+    # These will be process later in Stella::Client
+    def set(*args)
+      unless args.empty?
+        h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
+        @resources.merge! h unless h.empty?
+      end
+      @resources
+    end
+    alias_method :resources, :set
+    
     def params(*args)
-      @params.merge! args.first unless args.empty?
+      unless args.empty?
+        h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
+        @params.merge! h unless h.empty?
+      end
       @params
     end
     alias_method :param, :params

data/lib/stella/engine.rb

@@ -10,13 +10,17 @@ module Stella::Engine
     def update(*args)
       what, *args = args
       if respond_to?("update_#{what}")
-        Stella.ld "OBSERVER UPDATE: #{what}"
+        #Stella.ld "OBSERVER UPDATE: #{what}"
         Stella.rescue { self.send("update_#{what}", *args) }
       else
         Stella.ld "NO UPDATE HANDLER FOR: #{what}" 
       end
     end
-
+    
+    def runid
+      
+    end
+    
     def process_options!(plan, opts={})
       opts = {
         :hosts          => [],

data/lib/stella/engine/functional.rb

@@ -19,6 +19,9 @@ module Stella::Engine
       Stella.lflush
       sleep 0.3
       
+      # Identify this thread to Benelux
+      Benelux.current_track :functional 
+      
       dig = Stella.loglev > 1 ? plan.digest_cache : plan.digest_cache.shorter
       Stella.li " %-65s  ".att(:reverse) % ["#{plan.desc}  (#{dig})"]
       plan.usecases.each_with_index do |uc,i|
@@ -28,11 +31,8 @@ module Stella::Engine
         Stella.rescue { client.execute uc }
       end
       
-      #Benelux.update_all_track_timelines
-      #tl = Benelux.timeline
-      
-      # errors?
-      
+      tl = Benelux.thread_timeline
+      tl.stats.group(:failed).merge.n == 0
     end
     
     
@@ -44,30 +44,42 @@ module Stella::Engine
     end
     
     def update_receive_response(client_id, usecase, uri, req, params, counter, container)
-      msg = '   %-59s ' % [uri]
+      msg = '  %-6s %-53s ' % [req.http_method, uri]
       msg << container.status.to_s if Stella.loglev == 1
       Stella.li msg
       
-      Stella.li2 '   ' << container.response.request.header.send(:request_line)
-      
-      Stella.li2 $/, "   Request-Params:"
+      Stella.li2 $/, "   Params:"
       params.each do |pair|
         Stella.li2 "     %s: %s" % pair
       end
       
-      Stella.li2 $/, "   Request-Headers:"
+      Stella.li2 $/, '   ' << container.response.request.header.send(:request_line)
+      
       container.response.request.header.all.each do |pair|
-        Stella.li2 "     %s: %s" % pair
+        Stella.li2 "   %s: %s" % pair
       end
       
-      Stella.li2 $/, "   Response-Status: %3d" % [container.status]
+      if req.http_method == 'POST'
+        cont = container.response.request.body.content
+        if String === cont
+          Stella.li2 ('   ' << cont.split($/).join("#{$/}    "))
+        elsif HTTP::Message::Body::Parts === cont
+          cont.parts.each do |part|
+            if File === part
+              Stella.li2 "<#{part.path}>"
+            else
+              Stella.li2 part
+            end
+          end
+        end
+      end
       
-      Stella.li2 $/, "   Response-Headers:"
+      resh = container.response.header
+      Stella.li2 $/, '   HTTP/%s %3d %s' % [resh.http_version, resh.status_code, resh.reason_phrase]
       container.headers.all.each do |pair|
-        Stella.li2 "     %s: %s" % pair
+        Stella.li2 "   %s: %s" % pair
       end
-      Stella.li3 $/, "   Response-Content:"
-      Stella.li3 container.body.empty? ? '     [empty]' : container.body
+      Stella.li4 container.body.empty? ? '   [empty]' : container.body
       Stella.li2 $/
     end
     
@@ -76,22 +88,25 @@ module Stella::Engine
     
     def update_error_execute_response_handler(client_id, ex, req, container)
       Stella.le ex.message
-      Stella.li3 ex.backtrace
+      Stella.ld ex.backtrace
     end
     
     def update_request_error(client_id, usecase, uri, req, params, ex)
       desc = "#{usecase.desc} > #{req.desc}"
       Stella.le '  Client-%s %-45s %s' % [client_id.short, desc, ex.message]
-      Stella.li3 ex.backtrace
+      Stella.ld ex.backtrace
     end
     
     def update_quit_usecase client_id, msg
-      Stella.li4 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
+      Stella.li "  QUIT   %s" % [msg]
     end
     
+    def update_fail_request client_id, msg
+      Stella.li "  FAILED   %s" % [msg]
+    end
     
     def update_repeat_request client_id, counter, total
-      Stella.li4 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
+      Stella.li3 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
     end
     
   end

data/lib/stella/engine/load_create.rb

@@ -7,6 +7,8 @@ module Stella::Engine
     
     
     def execute_test_plan(packages, reps=1, duration=0)
+      @mode = :rolling
+      
       time_started = Time.now
 
       (1..reps).to_a.each { |rep|

data/lib/stella/engine/load_queue.rb

@@ -4,7 +4,7 @@ module Stella::Engine
     extend Stella::Engine::Base
     extend Stella::Engine::Load
     extend self
-    
+    ROTATE_TIMELINE = 15
     def execute_test_plan(packages, reps=1,duration=0)
       time_started = Time.now
       
@@ -46,13 +46,15 @@ module Stella::Engine
             Thread.current[:real_uctime].tick
             time_elapsed = (Time.now - time_started).to_i
             
-            if Stella.loglev >= 2 &&
-               Thread.current == @threads.first && 
-              (Time.now - prev_ptime).to_i >= 5
+            if (Time.now - prev_ptime).to_i >= ROTATE_TIMELINE
               prev_ptime, ruct = Time.now, Thread.current[:real_uctime]
-              args = [time_elapsed.to_i, ruct.n, ruct.mean, ruct.sd]
-              Stella.li2 $/, "REAL UC TIME: %ds (reps: %d): %.4fs %.4f(SD)" % args
-              Stella.lflush
+              if Stella.loglev >= 2 && Thread.current == @threads.first 
+                args = [time_elapsed.to_i, ruct.n, ruct.mean, ruct.sd]
+                Stella.li2 $/, "REAL UC TIME: %ds (reps: %d): %.4fs %.4f(SD)" % args
+                Stella.lflush
+              end
+              
+              Thread.current.rotate_timeline
             end
             
             # If a duration was given, we make sure 
@@ -69,6 +71,24 @@ module Stella::Engine
         end
       }
       
+      data_dumper = Thread.new do
+        prev_ptime = Time.now
+        loop do
+          break if Stella.abort?
+          break if @threads.select { |t| (!t.nil? && t.status) }.empty?
+          if (Time.now - prev_ptime).to_i >= (ROTATE_TIMELINE * 4)
+            Benelux.update_global_timeline
+            Stella.li $/, [:logger, (Time.now - prev_ptime).to_i, Benelux.timeline.size].inspect
+            prev_ptime = Time.now
+            ##TODO: Dump to file
+            ##Benelux.timeline.clear
+          end
+          sleep 5
+        end
+        
+      end
+      data_dumper.join
+      
       repscalc = Benelux::Stats::Calculator.new
       @threads.each { |t| t.join } # wait
       @threads.each { |t| repscalc.sample(t[:real_reps]) }

data/lib/stella/engine/loadbase.rb

@@ -36,7 +36,7 @@ module Stella::Engine
       Stella.li "Generating requests #{msg}...", $/
       Stella.lflush
       
-      @mode = :rolling
+      bt = Benelux.timeline
       
       begin
         execute_test_plan packages, opts[:repetitions], opts[:duration]
@@ -49,8 +49,7 @@ module Stella::Engine
         Stella.lflush
         
         Benelux.update_global_timeline
-
-        bt = Benelux.timeline
+        
         tt = Benelux.thread_timeline
         
         test_time = tt.stats.group(:execute_test_plan).mean
@@ -71,7 +70,7 @@ module Stella::Engine
         Stella.li $/
       end
       
-      # errors?
+      bt.stats.group(:failed).merge.n == 0
     end
     
   protected
@@ -111,7 +110,9 @@ module Stella::Engine
         Stella.ld "THREAD PACKAGE: #{usecase.desc} (#{pointer} + #{count})"
         # Fill the thread_package with the contents of the block
         packages.fill(pointer, count) do |index|
-          client = Stella::Client.new opts[:hosts].first, index+1
+          copts = {}
+          copts[:parse_templates] = false if opts[:'disable-templates']
+          client = Stella::Client.new opts[:hosts].first, index+1, copts
           client.add_observer(self)
           client.enable_nowait_mode if opts[:nowait]
           Stella.li4 "Created client #{client.digest.short}"
@@ -132,6 +133,11 @@ module Stella::Engine
     def generate_report(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
+        Stella.ld "No stats"
+        return
+      end
       
       Stella.li $/, " %-72s  ".att(:reverse) % ["#{plan.desc}  (#{plan.digest_cache.shorter})"]
       plan.usecases.uniq.each_with_index do |uc,i| 
@@ -191,7 +197,7 @@ module Stella::Engine
       end
       
       Stella.li ' ' << " %-66s ".att(:reverse) % 'Total:'
-      stats = global_timeline.stats.group(:do_request).merge
+      
       failed = global_timeline.stats.group(:failed)
       respgrp = global_timeline.stats.group(:execute_response_handler)
       resst = respgrp.tag_values(:status)
@@ -200,8 +206,8 @@ module Stella::Engine
         size = respgrp[:status => status].size
         statusi << [status, size]
       end
-      Stella.li  '      %-30s %d' % ['Total requests', stats.n]
-      success = stats.n - failed.n
+      Stella.li  '      %-30s %d' % ['Total requests', global_stats.n]
+      success = global_stats.n - failed.n
       Stella.li  '       %-29s %d (req/s: %.2f)' % [:success, success, success/test_time]
       statusi.each do |pair|
         Stella.li2 '        %-28s %s: %d' % ['', *pair]
@@ -229,7 +235,9 @@ module Stella::Engine
       
     def update_receive_response(client_id, usecase, uri, req, params, counter, container)
       desc = "#{usecase.desc} > #{req.desc}"
-      Stella.li3 '  Client-%s %3d %-6s %-45s' % [client_id.shorter, container.status, req.http_method, uri]
+      args = [client_id.shorter, container.status, req.http_method, uri, params.inspect]
+      Stella.li3 '  Client-%s %3d %-6s %s %s' % args
+      Stella.ld '  Client-%s %3d %s' % [client_id.shorter, container.status, container.body]
     end
     
     def update_execute_response_handler(client_id, req, container)
@@ -239,20 +247,23 @@ module Stella::Engine
       desc = "#{container.usecase.desc} > #{req.desc}"
       Stella.li $/ if Stella.loglev == 1
       Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.li3 ex.backtrace
+      Stella.li ex.backtrace
     end
     
     def update_request_error(client_id, usecase, uri, req, params, ex)
       desc = "#{usecase.desc} > #{req.desc}"
       Stella.li $/ if Stella.loglev == 1
       Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.li3 ex.backtrace
+      Stella.li ex.backtrace
     end
 
     def update_quit_usecase client_id, msg
       Stella.li3 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
     end
     
+    def update_fail_request client_id, msg
+      Stella.li3 "  Client-%s     FAILED   %s" % [client_id.shorter, msg]
+    end
     
     def update_repeat_request client_id, counter, total
       Stella.li3 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
@@ -262,7 +273,6 @@ module Stella::Engine
       blk.call
     rescue => ex
       Stella.le '  Error in Client-%s: %s' % [client_id.shorter, ex.message]
-      Stella.li3 ex.backtrace
     end
     
     Benelux.add_timer Stella::Engine::Load, :build_thread_package

data/lib/stella/testplan.rb

@@ -7,6 +7,7 @@ class Testplan
   extend Attic
   
   attic :base_path
+  attic :plan_path
   
   attr_accessor :usecases
   attr_accessor :desc
@@ -36,8 +37,9 @@ class Testplan
     conf = File.read path
     plan = Stella::Testplan.new
     plan.base_path = File.dirname path
+    plan.plan_path = path
     # eval so the DSL code can be executed in this namespace.
-    plan.instance_eval conf
+    plan.instance_eval conf, path 
     plan
   end
   
@@ -58,6 +60,7 @@ class Testplan
   
   # make sure all clients share identical test plans
   def freeze
+    Stella.ld "FREEZE TESTPLAN: #{desc}"
     @usecases.each { |uc| uc.freeze }
     super
     self
@@ -70,6 +73,7 @@ class Testplan
     ratio, name = args[1], args[0] if args[0].is_a?(String)
     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
     @testplan_current_ratio += uc.ratio if uc.ratio > 0
@@ -97,6 +101,9 @@ class Testplan
       desc = uc.desc || "Usecase ##{i+1}"
       desc += "  (#{dig}) "
       str << (' ' << " %-61s %s%% ".att(:reverse).bright) % [desc, uc.ratio_pretty]
+      unless uc.http_auth.nil?
+        str << '    Auth: %s (%s/%s)' % uc.http_auth.values
+      end
       requests = uc.requests.each do |r| 
         dig = long ? r.digest_cache : r.digest_cache.shorter
         str << "    %-62s".bright % ["#{r.desc}  (#{dig})"]

data/lib/stella/testplan/usecase.rb

@@ -21,10 +21,16 @@ class Testplan
     include Gibbler::Complex
     extend Attic
     
+    class Auth < Struct.new(:kind, :user, :pass)
+      include Gibbler::Complex
+    end
+    
     attic :base_path # we don't want gibbler to see this
+    attic :plan_path
     
     attr_accessor :desc
     attr_writer :ratio
+    attr_reader :http_auth
     
     attr_accessor :requests
     attr_accessor :resources
@@ -63,15 +69,17 @@ class Testplan
     # directory is assumed to be the same directory containing the test plan).
     def read(path)
       path = File.join(base_path, path) if base_path
+      Stella.ld "READING FILE: #{path}"
       File.read(path)
     end
-    
+      
     def list(path)
       read(path).split $/
     end
     
     def csv(path)
       path = File.join(base_path, path) if base_path
+      Stella.ld "READING CSV: #{path}"
       CSV.read(path)
     end
     
@@ -81,6 +89,11 @@ class Testplan
       self
     end
     
+    def auth(user, pass=nil, kind=:basic)
+      @http_auth ||= Auth.new
+      @http_auth.user, @http_auth.pass, @http_auth.kind = user, pass, kind
+    end
+    
     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

data/lib/stella/version.rb

@@ -5,10 +5,10 @@ module Stella
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 1.freeze
+      TINY  = 2.freeze
       PATCH = '001'.freeze
     end
-    def self.to_s; [MAJOR, MINOR, TINY, PATCH].join('.'); 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