stella 0.8.1.002 → 0.8.2.001

data/lib/stella/engine/{load_queue.rb → load.rb}

@@ -1,10 +1,10 @@
+require 'stella/engine/loadbase'
 
 module Stella::Engine
-  module LoadQueue
-    extend Stella::Engine::Base
+  module Load
     extend Stella::Engine::Load
     extend self
-    ROTATE_TIMELINE = 15
+    ROTATE_TIMELINE = 5
     def execute_test_plan(packages, reps=1,duration=0,arrival=nil)
       time_started = Time.now
       
@@ -90,7 +90,7 @@ module Stella::Engine
       Stella.stdout.info2 $/, $/
     end
     
-    Benelux.add_timer Stella::Engine::LoadQueue, :execute_test_plan
+    Benelux.add_timer Stella::Engine::Load, :execute_test_plan
     
   end
 end

data/lib/stella/engine/loadbase.rb

@@ -4,17 +4,16 @@ module Stella::Engine
     extend Stella::Engine::Base
     extend self
     
-    @timers = [:do_request]
+    @timers = [:response_time]
     @counts = [:response_content_size]
     @reqlog = nil
     @logdir = nil
     
     class << self
-      attr_accessor :timers, :counts, :logdir
+      attr_accessor :timers, :counts, :logdir, :testrun
     end
     
     def run(plan, opts={})
-      
       opts = process_options! plan, opts
       @threads, @max_clients, @real_reps = [], 0, 0
       
@@ -26,30 +25,16 @@ module Stella::Engine
         File.unlink latest if File.exists? latest
         FileUtils.ln_sf File.basename(@logdir), latest
       end
-        
-      @reqlog = Stella::Logger.new log_path(plan, 'requests')
-      @failog = Stella::Logger.new log_path(plan, 'requests-exceptions')
-      @sumlog = Stella::Logger.new log_path(plan, 'summary')
-      @optlog = Stella::Logger.new log_path(plan, 'options')
-      @authlog = Stella::Logger.new log_path(plan, 'requests-auth')
-      
-      @syslog = Stella::Logger.new log_path(plan, 'sysinfo')
-      @syslog.info(Stella.sysinfo.dump(:yaml)) and @syslog.close
-      
-      @plalog = Stella::Logger.new log_path(plan, 'plan')
-      @plalog.info(plan.pretty.noansi) and @plalog.close
       
+      @statlog_path = log_path(plan, 'stats')
+      @sumlog = Stella::Logger.new log_path(plan, 'summary')
+      @failog = Stella::Logger.new log_path(plan, 'exceptions')
       
       Stella.stdout.add_template :head, '  %s: %s'
       Stella.stdout.add_template :status,  "#{$/}%s..."
       
-      @sumlog.add_template :dsummary, '%20s: %8d'
-      @sumlog.add_template :fsummary, '%20s: %8.2f'
-      @optlog.add_template :head, '%10s: %s'
-      @failog.add_template :request, '%s %s'
-      
-      if Stella.stdout.lev > 2
-        Load.timers += [:query, :connect, :socket_gets_first_byte, :get_body]
+      if Stella.stdout.lev >= 2
+        Load.timers += [:socket_connect, :send_request, :first_byte, :receive_response]
         Load.counts  = [:request_header_size, :request_content_size]
         Load.counts += [:response_headers_size, :response_content_size]
       end
@@ -64,13 +49,12 @@ module Stella::Engine
         Stella.stdout.head 'Testrun', @testrun.remote_digest
       end
       
+      @testrun.save(@statlog_path)
+      
       @dumper = prepare_dumper(plan, opts)
       
       counts = calculate_usecase_clients plan, opts
       
-      @optlog.head 'RUNID', runid(plan)
-      @optlog.head 'OPTIONS', opts.inspect
-      
       packages = build_thread_package plan, opts, counts
       
       if opts[:duration] > 0
@@ -80,13 +64,15 @@ module Stella::Engine
       end
       
       Stella.stdout.head 'Plan', "#{plan.desc} (#{plan.digest.shorter})"
+      Stella.stdout.head 'Hosts', opts[:hosts].join(', ')
       Stella.stdout.head 'Clients', counts[:total]
       Stella.stdout.head 'Limit', timing
       
+      Stella.stdout.head 'Arrival', opts[:arrival] if opts[:arrival]
+      
       @dumper.start
       
       begin 
-        @optlog.head "START", Time.now.to_s
         Stella.stdout.status "Running" 
         execute_test_plan packages, opts[:repetitions], opts[:duration], opts[:arrival]
       rescue Interrupt
@@ -100,15 +86,11 @@ module Stella::Engine
       
       Stella.stdout.status "Processing"
       
-      @optlog.head "END", Time.now.to_s
-      @optlog.flush
-      
       @dumper.stop
       
       bt = Benelux.timeline
       tt = Benelux.thread_timeline
       
-      
       # TODO: don't get test time from benelux. 
       test_time = tt.stats.group(:execute_test_plan).mean
       generate_report @sumlog, plan, test_time
@@ -118,7 +100,7 @@ module Stella::Engine
       
       Stella.stdout.info $/, "Log dir: #{@logdir}"
       
-      @testrun.summary[:summary][:failed].n == 0 
+      @testrun.stats[:summary][:failed].n == 0 
     end
     
   protected
@@ -132,41 +114,26 @@ module Stella::Engine
     end
     
     def prepare_dumper(plan, opts)
-      hand = Stella::Hand.new(LoadQueue::ROTATE_TIMELINE, 2.seconds) do
+      hand = Stella::Hand.new(Load::ROTATE_TIMELINE, 2.seconds) do
         Benelux.update_global_timeline 
         # @threads contains only stella clients
         concurrency = @threads.select { |t| !t.status.nil? }.size
         batch, timeline = Benelux.timeline_updates, Benelux.timeline_chunk
         @testrun.add_sample batch, concurrency, timeline
-        
-        #reqlog.info [Time.now, Benelux.timeline.size].inspect
-        @reqlog.info Benelux.timeline.messages.filter(:kind => :request)
+        @testrun.save(@statlog_path)
         @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
-        
         Benelux.timeline.clear if opts[:"no-stats"]
-        
       end
       hand.finally do
-        #total = @testrun.stats[:summary][:do_request].n 
-        #failed = @testrun.stats[:summary][:failed].n 
-        #@sumlog.info $/, "Summary: "
-        #@sumlog.dsummary 'successful req', total-failed
-        #@sumlog.dsummary "failed req", failed
-        #@sumlog.dsummary "max clients", @max_clients
-        #@sumlog.dsummary "repetitions", @real_reps
-        ##@sumlog.fsummary "test time", test_time
-        ##@sumlog.fsummary "reporting time", report_time
-        #@sumlog.flush
+        @testrun.save(@statlog_path)
       end
       hand
     end
 
     def generate_report(sumlog,plan,test_time)
       global_timeline = Benelux.timeline
-      global_stats = global_timeline.stats.group(:do_request).merge
+      global_stats = global_timeline.stats.group(:response_time).merge
       if global_stats.n == 0
         Stella.ld "No stats"
         return
@@ -176,9 +143,9 @@ module Stella::Engine
       plan.usecases.uniq.each_with_index do |uc,i| 
         
         # TODO: Create Ranges object, like Stats object
-        # global_timeline.ranges(:do_request)[:usecase => '1111']
-        # The following returns globl do_request ranges. 
-        requests = 0 #global_timeline.ranges(:do_request).size
+        # global_timeline.ranges(:response_time)[:usecase => '1111']
+        # The following returns global response_time ranges. 
+        requests = 0 #global_timeline.ranges(:response_time).size
         
         desc = uc.desc || "Usecase ##{i+1} "
         desc << "  (#{uc.digest_cache.shorter}) "
@@ -203,18 +170,10 @@ module Stella::Engine
         
         @sumlog.info "   Sub Total:".bright
         
-        stats = global_timeline.stats.group(:do_request)[uc.digest_cache].merge
+        stats = global_timeline.stats.group(:response_time)[uc.digest_cache].merge
         failed = global_timeline.stats.group(:failed)[uc.digest_cache].merge
         respgrp = global_timeline.stats.group(:execute_response_handler)[uc.digest_cache]
         resst = respgrp.tag_values(:status)
-        statusi = []
-        resst.each do |status|
-          size = respgrp[:status => status].size
-          statusi << "#{status}: #{size}"
-        end
-        @sumlog.info '      %-30s %d (%s)' % ['Total requests', stats.n, statusi.join(', ')]
-        @sumlog.info '       %-29s %d' % [:success, stats.n - failed.n]
-        @sumlog.info '       %-29s %d' % [:failed, failed.n]
         
         Load.timers.each do |sname|
           stats = global_timeline.stats.group(sname)[uc.digest_cache].merge
@@ -228,9 +187,20 @@ module Stella::Engine
           @sumlog.flush
         end
         @sumlog.info $/
+        statusi = []
+        resst.each do |status|
+          size = respgrp[:status => status].size
+          statusi << "#{status}: #{size}"
+        end
+        @sumlog.info '      %-30s %d (%s)' % ['Total requests', stats.n, statusi.join(', ')]
+        @sumlog.info '       %-29s %d' % [:success, stats.n - failed.n]
+        @sumlog.info '       %-29s %d' % [:failed, failed.n]
+        
+        @sumlog.info $/
       end
       
       @sumlog.info ' ' << " %-66s ".att(:reverse) % 'Total:'
+      @sumlog.flush
       
       failed = global_timeline.stats.group(:failed)
       respgrp = global_timeline.stats.group(:execute_response_handler)
@@ -240,14 +210,7 @@ module Stella::Engine
         size = respgrp[:status => status].size
         statusi << [status, size]
       end
-      @sumlog.info  '      %-30s %d' % ['Total requests', global_stats.n]
-      success = global_stats.n - failed.n
-      @sumlog.info  '       %-29s %d (req/s: %.2f)' % [:success, success, success/test_time]
-      statusi.each do |pair|
-        @sumlog.info3 '        %-28s %s: %d' % ['', *pair]
-      end
-      @sumlog.info  '       %-29s %d' % [:failed, failed.n]
-      
+     
       Load.timers.each do |sname|
         stats = global_timeline.stats.group(sname).merge
         @sumlog.info '      %-30s %-.3fs     %-.3f(SD)' % [sname, stats.mean, stats.sd]
@@ -259,6 +222,19 @@ module Stella::Engine
         @sumlog.info '      %-30s %-12s (avg:%s)' % [sname, stats.sum.to_bytes, stats.mean.to_bytes]
         @sumlog.flush
       end
+      
+      @sumlog.info $/
+      @sumlog.info  '      %-30s %d' % ['Total requests', global_stats.n]
+      
+      success = global_stats.n - failed.n
+      @sumlog.info  '       %-29s %d (req/s: %.2f)' % [:success, success, success/test_time]
+      statusi.each do |pair|
+        @sumlog.info3 '        %-28s %s: %d' % ['', *pair]
+      end
+      @sumlog.info  '       %-29s %d' % [:failed, failed.n]
+      
+      @sumlog.flush
+      
     end
     
     
@@ -314,7 +290,7 @@ module Stella::Engine
     
     def generate_runtime_report(plan)
       gt = Benelux.timeline
-      gstats = gt.stats.group(:do_request).merge
+      gstats = gt.stats.group(:response_time).merge
       
       plan.usecases.uniq.each_with_index do |uc,i| 
         uc.requests.each do |req| 
@@ -348,9 +324,9 @@ module Stella::Engine
         '%s=%s' % el 
       }.compact.join('&') # remove skipped params
       args << container.unique_id[0,10]
-      Benelux.thread_timeline.add_message args.join('; '), 
-       :status => container.status,
-       :kind => :request
+      #Benelux.thread_timeline.add_message args.join('; '), 
+      # :status => container.status,
+      # :kind => :request
       args = [client_id.shorter, container.status, req.http_method, uri, params.inspect]
       Stella.stdout.info3 '  Client-%s %3d %-6s %s %s' % args
             
@@ -426,8 +402,8 @@ module Stella::Engine
     
     def update_request_timeout(client_id, usecase, uri, req, params, headers, counter, container)
       Stella.stdout.info3 "  Client-%s     TIMEOUT   %-53s" % [client_id.shorter, uri]
-      args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
       Benelux.thread_timeline.add_count :failed, 1
+      args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
       args.push [uri, 'TOUT', container.unique_id[0,10]]
       Benelux.thread_timeline.add_message args.join('; '), :kind => :timeout
     end

data/lib/stella/logger.rb

@@ -4,11 +4,7 @@ module Stella
   
 
   class Logger
-    
-    @@disable = false
-    def self.disable!()  @@disable = true  end
-    def self.disabled?()  @@disable == true end
-    
+        
     attr_accessor :lev
     attr_reader :templates
     
@@ -17,10 +13,14 @@ module Stella
       @lev, @offset = 1, 0
       @templates = {}
       @autoflush = false
-      return if Logger.disabled?
+      @disable = false
       self.output = output
     end
     
+    def disable!()  @disable = true  end
+    def enable!()  @disable = true  end
+    def disabled?()  @disable == true end
+      
     def autoflush!()  @autoflush = true   end
     def autoflush?()  @autoflush == true  end
       
@@ -37,14 +37,14 @@ module Stella
     end
     
     def print(level, *msg)
-      return if level > @lev || Logger.disabled?
+      return if level > @lev || disabled?
       @buffer.print *msg
       flush if autoflush?
       true
     end
     
     def puts(level, *msg)
-      return if level > @lev || Logger.disabled?
+      return if level > @lev || disabled?
       @buffer.puts *msg
       flush if autoflush?
       true
@@ -83,7 +83,7 @@ module Stella
     
     # TODO: There's a big when using print (no newline)
     def flush
-      return if Logger.disabled?
+      return if disabled?
       @mutex.synchronize do
         #return if @offset == @output.tell
         @buffer.seek @offset
@@ -99,7 +99,7 @@ module Stella
     end
     
     def clear
-      return if Logger.disabled?
+      return if disabled?
       flush
       @mutex.synchronize do
         @buffer.rewind
@@ -108,7 +108,7 @@ module Stella
     end
     
     def close
-      return if Logger.disabled?
+      return if disabled?
       flush
       @buffer.close
       @output.close
@@ -120,7 +120,7 @@ module Stella
   # Must call flush to send to output. 
   class SyncLogger < Logger
     def print(level, *msg)
-      return if level > @lev || Logger.disabled?
+      return if level > @lev || disabled?
       @mutex.synchronize { 
         @buffer.print *msg 
         flush if autoflush?
@@ -130,7 +130,7 @@ module Stella
 
     def puts(level, *msg)
       #Stella.ld [level, @lev, msg]
-      return if level > @lev || Logger.disabled?
+      return if level > @lev || disabled?
       @mutex.synchronize { 
         @buffer.puts *msg 
         flush if autoflush?

data/lib/stella/service.rb

@@ -153,13 +153,13 @@ class Stella::Service
       trun.remote_digest = obj['digest']
       @runid = obj['digest']
     end
-    def testrun_stats(summary, samples)
+    def testrun_stats(stats, samples)
       raise NoTestrunSelected, "no testrun: #{runid}" unless @runid
       req = uri('v1', 'testrun', "stats.json")
       params = {
         :runid => @runid,
         :status => 'running',
-        :summary => summary.to_json,
+        :stats => stats.to_json,
         :samples => samples.to_json
       }
       res = send_request :post, req, params

data/lib/stella/testplan.rb

@@ -41,7 +41,8 @@ class Testplan < Storable
   # TODO: Add Stellar::TOKEN to the calculation
   gibbler :id, :usecases, :description
   
-  def initialize(uris=[], opts={})
+  def initialize(*uris)
+    uris.flatten!
     self.description = "Test plan"
     @usecases = []
     @testplan_current_ratio = 0
@@ -56,7 +57,6 @@ class Testplan < Storable
         uri = URI.parse uri
         uri.path = '/' if uri.path.nil? || uri.path.empty?
         req = usecase.add_request :get, uri.path
-        req.wait = opts[:wait] if opts[:wait]
       end
       self.add_usecase usecase
     end
@@ -124,10 +124,12 @@ class Testplan < Storable
   end
   
   def pretty(long=false)
+    self.digest # make sure we have values in the cache
     str = []
     dig = long ? self.digest_cache : self.digest_cache.shorter
     str << " %-66s  ".att(:reverse) % ["#{self.description}  (#{dig})"]
     @usecases.each_with_index do |uc,i| 
+      uc.digest
       dig = long ? uc.digest_cache : uc.digest_cache.shorter
       desc = uc.description || "Usecase ##{i+1}"
       desc += "  (#{dig}) "
@@ -136,6 +138,7 @@ class Testplan < Storable
         str << '    Auth: %s (%s/%s)' % uc.http_auth.values
       end
       requests = uc.requests.each do |r| 
+        r.digest
         dig = long ? r.digest_cache : r.digest_cache.shorter
         str << "    %-62s".bright % ["#{r.description}  (#{dig})"]
         str << "      %s" % [r]

data/lib/stella/utils.rb

@@ -109,7 +109,7 @@ module Stella
     end
     
     # A basic file writer
-    def write_to_file(filename, content, mode, chmod=600)
+    def write_to_file(filename, content, mode, chmod=0600)
       mode = (mode == :append) ? 'a' : 'w'
       f = File.open(filename,mode)
       f.puts content