stella 0.7.2.002 → 0.7.2.003

data/CHANGES.txt

@@ -1,5 +1,10 @@
 STELLA, CHANGES
 
+#### 0.7.3 (2009-10-30) ###############################
+
+* ADDED: Arrival rate
+* ADDED: Added HTTP auth per request
+
 
 #### 0.7.2 (2009-10-29) ###############################
 

data/bin/stella

@@ -100,6 +100,7 @@ class Stella::CLI::Definition
   option :W, :nowait, "Ignore wait times"
   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
 

data/lib/stella/cli.rb

@@ -26,7 +26,7 @@ class Stella::CLI < Drydock::Command
   def generate
     opts = {}
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :duration, :'disable-templates'].each do |opt|
+    [:nowait, :clients, :repetitions, :duration, :arrival, :'disable-templates'].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
     

data/lib/stella/client.rb

@@ -58,7 +58,7 @@ 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.li2 "  AUTH   (#{http_auth.kind}) #{domain} (#{user}/#{pass})"
+          Stella.li3 "  AUTH   (#{http_auth.kind}) #{domain} (#{user}/#{pass})"
           http_client.set_auth(domain, user, pass)
         end
         

data/lib/stella/engine.rb

@@ -37,7 +37,7 @@ module Stella::Engine
       opts[:clients] = plan.usecases.size if opts[:clients] < plan.usecases.size
       
       if opts[:clients] > @@client_limit
-        Stella.li3 "Client limit is #{@@client_limit}"
+        Stella.li2 "Client limit is #{@@client_limit}"
         opts[:clients] = @@client_limit
       end
       

data/lib/stella/engine/load_queue.rb

@@ -5,7 +5,7 @@ module Stella::Engine
     extend Stella::Engine::Load
     extend self
     ROTATE_TIMELINE = 15
-    def execute_test_plan(packages, reps=1,duration=0)
+    def execute_test_plan(packages, reps=1,duration=0,arrival=nil)
       time_started = Time.now
       
       pqueue = Queue.new
@@ -38,7 +38,7 @@ module Stella::Engine
             #Stella.li [package.client.gibbler.shorter, package.usecase.gibbler.shorter, rep].inspect
             Stella::Engine::Load.rescue(c.digest_cache) {
               break if Stella.abort?
-              print '.' if Stella.loglev == 2
+              print '.' if Stella.loglev == 1
               stats = c.execute uc
             }
             Benelux.remove_thread_tags :rep
@@ -69,6 +69,13 @@ module Stella::Engine
           
           pqueue << package  # return the package to the queue
         end
+        
+        unless arrival.nil?
+          # Create 1 second / users per second 
+          args = [1/arrival, @threads.size, packages.size]
+          Stella.li2 $/, "======== ARRIVAL (%s): %s of %s" % args
+          sleep 1/arrival
+        end
       }
       
       data_dumper = Thread.new do

data/lib/stella/engine/loadbase.rb

@@ -15,7 +15,7 @@ module Stella::Engine
       opts = process_options! plan, opts
       @threads, @max_clients, @real_reps = [], 0, 0
       
-      if Stella.loglev > 1
+      if Stella.loglev > 2
         Load.timers += [:query, :connect, :socket_gets_first_byte, :get_body]
         Load.counts  = [:request_header_size, :request_content_size]
         Load.counts += [:response_headers_size, :response_content_size]
@@ -39,7 +39,7 @@ module Stella::Engine
       bt = Benelux.timeline
       
       begin
-        execute_test_plan packages, opts[:repetitions], opts[:duration]
+        execute_test_plan packages, opts[:repetitions], opts[:duration], opts[:arrival]
       rescue Interrupt
         Stella.li "Stopping test...", $/
         Stella.abort!
@@ -210,7 +210,7 @@ module Stella::Engine
       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]
+        Stella.li3 '        %-28s %s: %d' % ['', *pair]
       end
       Stella.li  '       %-29s %d' % [:failed, failed.n]
       
@@ -236,7 +236,7 @@ module Stella::Engine
     def update_receive_response(client_id, usecase, uri, req, params, counter, container)
       desc = "#{usecase.desc} > #{req.desc}"
       args = [client_id.shorter, container.status, req.http_method, uri, params.inspect]
-      Stella.li3 '  Client-%s %3d %-6s %s %s' % args
+      Stella.li2 '  Client-%s %3d %-6s %s %s' % args
       Stella.ld '  Client-%s %3d %s' % [client_id.shorter, container.status, container.body]
     end
     
@@ -258,15 +258,15 @@ module Stella::Engine
     end
 
     def update_quit_usecase client_id, msg
-      Stella.li3 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
+      Stella.li2 "  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]
+      Stella.li2 "  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]
+      Stella.li2 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
     end
     
     def self.rescue(client_id, &blk)

data/lib/stella/version.rb

@@ -6,7 +6,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 2.freeze
-      PATCH = '002'.freeze
+      PATCH = '003'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/stella.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.2.002"
+  s.version = "0.7.2.003"
   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.0'
+  s.add_dependency 'benelux',    '>= 0.5.1'
   s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.7.1'
   s.add_dependency 'sysinfo',    '>= 0.7.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.2.002
+  version: 0.7.2.003
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock