stella 0.8.3.002 → 0.8.4.001

data/CHANGES.txt

@@ -11,6 +11,17 @@ STELLA, CHANGES
 * TODO: process templates for calls to set in get blocks
 
 
+#### 0.8.4 (2010-03-??) ###############################
+
+* FIXED: Misc issues getting and setting headers, params, and resources
+* FIXED: There was no response body in Stella::Engine::Log objects
+* CHANGE: Store URIs as strings in Stella::Engine::Log objects
+* CHANGE: Stella::Data::HTTP now uses @header instead of @headers
+* ADDED: Testrun#end_time, Testrun#running?
+* ADDED: Testrun.elapsed_seconds
+* ADDED: Testrun.granularity which replaces Load::ROTATE_TIMELINE
+
+
 #### 0.8.3 (2010-03-15) ###############################
 
 * FIXED: Testrun digest handling

data/Rakefile

@@ -25,9 +25,9 @@ begin
     gem.email = "delano@solutious.com"
     gem.homepage = "http://blamestella.com/"
     gem.authors = ["Delano Mandelbaum"]
-    gem.add_dependency("gibbler",    ">= 0.7.4")
+    gem.add_dependency("gibbler",    ">= 0.7.6")
     gem.add_dependency("drydock",    ">= 0.6.9")
-    gem.add_dependency("benelux",    ">= 0.5.11")
+    gem.add_dependency("benelux",    ">= 0.5.12")
     gem.add_dependency('sysinfo',    '>= 0.7.3')
     gem.add_dependency('storable',   '>= 0.6.4')
     gem.add_dependency("nokogiri")

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 0
 :MINOR: 8
-:PATCH: 3
-:BUILD: '002'
+:PATCH: 4
+:BUILD: '001'

data/bin/stella

@@ -85,12 +85,13 @@ class Stella::CLI::Definition
   about "Preview a test plan"
   usage "stella preview [-p path/2/testplan.rb] "
   option :c, :clients, Integer, "Maximum number of virtual clients (ignored)"
+  option :a, :arrival, Float, "Arrival rate (ignored)"
   option :r, :repetitions, Integer, "Number of times to repeat the testplan (ignored)"
   option :d, :duration, String, "Max duration to run test (ignored)"
   option :W, :nowait, "Ignore wait times (ignored)"
   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 (ignored)"
+  option :g, :granularity, Integer, "Amount of time (in seconds) between timeline rotations"
   command :preview => Stella::CLI
   
   about "Verify a test plan"
@@ -98,12 +99,13 @@ class Stella::CLI::Definition
   usage "e.g."
   usage "   $ stella verify -p path/2/testplan.rb http://stellaaahhhh.com/"
   option :c, :clients, Integer, "Maximum number of virtual clients (ignored)"
+  option :a, :arrival, Float, "Arrival rate (ignored)"
   option :r, :repetitions, Integer, "Number of times to repeat the testplan (ignored)"
   option :d, :duration, String, "Max duration to run test (ignored)"
   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 (ignored)"
+  option :g, :granularity, Integer, "Amount of time (in seconds) between timeline rotations"
   command :verify => Stella::CLI
   
   about "Generate requests"
@@ -114,13 +116,15 @@ class Stella::CLI::Definition
   usage "   $ stella generate -p path/2/testplan.rb -u 100 -r 50 http://stellaaahhhh.com:3114/"
   #usage "   $ stella stress --clients=50 --repetitions=20 http://stellaaahhhh.com/"
   option :c, :clients, Integer, "Maximum number of virtual clients"
+  option :a, :arrival, Float, "Arrival rate (new clients per second)"
   option :r, :repetitions, Integer, "Number of times to repeat the testplan (per vclient)"
   option :d, :duration, String, "Max duration to run test"
   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 :g, :granularity, Integer, "Amount of time (in seconds) between timeline rotations"
   command :generate => Stella::CLI
+  
   about "Initialize Stella configuration"
   command :init do
     Stella::Config.init

data/lib/stella/cli.rb

@@ -22,7 +22,7 @@ class Stella::CLI < Drydock::Command
   def run(mode)
     opts = { :mode => mode }
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :duration, :arrival].each do |opt|
+    [:nowait, :clients, :repetitions, :duration, :arrival, :granularity].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
     [:'notemplates', :'nostats', :'noheader', :'noparam'].each do |opt|

data/lib/stella/data/http.rb

@@ -46,7 +46,7 @@ module Stella::Data::HTTP
     def initialize (method=nil, uri_str=nil, version="1.1", &definition)
       @uri = uri_str.to_s
       @http_method, @http_version = method, version
-      @headers, @params, @response_handler = {}, {}, {}
+      @header, @params, @response_handler = {}, {}, {}
       @resources = {}
       @autofollow = false
       @wait = 0
@@ -89,23 +89,26 @@ module Stella::Data::HTTP
     end
     
     def wait(*args)
+      args = [args].flatten.compact
       @wait = args.first unless args.empty?
       @wait
     end
     alias_method :sleep, :wait
     
     def headers(*args)
+      args = [args].flatten.compact
       unless args.empty?
         h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
-        @headers.merge! h unless h.empty?
+        @header.merge! h unless h.empty?
       end
-      @headers
+      @header
     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)
+      args = [args].flatten.compact
       unless args.empty?
         h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
         @resources.merge! h unless h.empty?
@@ -115,6 +118,7 @@ module Stella::Data::HTTP
     alias_method :resources, :set
     
     def params(*args)
+      args = [args].flatten.compact
       unless args.empty?
         h = Hash === args[0] ? args[0] : {args[0]=> args[1]}
         @params.merge! h unless h.empty?
@@ -160,7 +164,7 @@ module Stella::Data::HTTP
     def freeze
       return if frozen?
       @params = convert_values_to_templates @params
-      @headers = convert_values_to_templates @headers
+      @header = convert_values_to_templates @header
       super
       self
     end

data/lib/stella/engine/functional.rb

@@ -50,7 +50,7 @@ module Stella::Engine
       log = Stella::Engine::Log.new Time.now.to_f, container.unique_id, client_id,
                                     'testplanid',
                                     usecase.id, req.id,
-                                    req.http_method, container.status, uri,
+                                    req.http_method, container.status, uri.to_s,
                                     params, container.response.request.header.dump, 
                                     container.response.header.dump, 
                                     container.response.body.dump

data/lib/stella/engine/load.rb

@@ -89,7 +89,6 @@ module Stella::Engine
       testrun
     end
     
-    ROTATE_TIMELINE = 5
     def execute_test_plan(packages, testrun)
       time_started = Time.now
       
@@ -133,7 +132,7 @@ module Stella::Engine
             Thread.current[:real_uctime].tick
             time_elapsed = (Time.now - time_started).to_i
             
-            if (Time.now - prev_ptime).to_i >= ROTATE_TIMELINE
+            if (Time.now - prev_ptime).to_i >= testrun.granularity
               prev_ptime, ruct = Time.now, Thread.current[:real_uctime]
               if Stella.stdout.lev >= 2 && Thread.current == @threads.first 
                 args = [time_elapsed.to_i, ruct.n, ruct.mean, ruct.sd]
@@ -155,6 +154,8 @@ module Stella::Engine
           
           pqueue << package  # return the package to the queue
         end
+
+        #p [testrun.arrival, 1/testrun.arrival]
         
         unless testrun.arrival.nil? || testrun.arrival.to_f <= 0
           # Create 1 second / users per second 
@@ -163,6 +164,7 @@ module Stella::Engine
           Stella.stdout.info3 $/, "-> NEW CLIENT: %s of %s" % args
           sleep 1/testrun.arrival
         end
+        
       }
       
       repscalc = Benelux::Stats::Calculator.new
@@ -170,6 +172,7 @@ module Stella::Engine
       @threads.each { |t| repscalc.sample(t[:real_reps]) }
       @real_reps = repscalc.mean.to_i
       
+      
       #Stella.stdout.info "*** REPETITION #{@real_reps} of #{reps} ***"
       
       Stella.stdout.info2 $/, $/
@@ -187,7 +190,7 @@ module Stella::Engine
     end
     
     def prepare_dumper(testrun)
-      hand = Stella::Hand.new(Load::ROTATE_TIMELINE, 2.seconds) do
+      hand = Stella::Hand.new(testrun.granularity, 2.seconds) do
         Benelux.update_global_timeline 
         # @threads contains only stella clients
         concurrency = @threads.select { |t| !t.status.nil? }.size
@@ -202,6 +205,7 @@ module Stella::Engine
         Benelux.timeline.clear if testrun.nostats
       end
       hand.finally do
+        testrun.end_time = Time.now.utc.to_i
         testrun.save
       end
       hand
@@ -382,17 +386,19 @@ module Stella::Engine
     def update_prepare_request(client_id, usecase, req, counter)
      
     end
-      
+    
     def update_receive_response(client_id, usecase, uri, req, params, headers, counter, container)
       if @opts[:with_content]
         log = Stella::Engine::Log.new Time.now.to_f, container.unique_id, client_id,
                                       'testplanid',
                                       usecase.id, req.id,
-                                      req.http_method, container.status, uri,
+                                      req.http_method, container.status, uri.to_s,
                                       params, container.response.request.header.dump, 
                                       container.response.header.dump, 
                                       container.response.body.dump
 
+        # Fix for no data, but why??
+        log.response_body = container.response.body.dump
         Benelux.thread_timeline.add_message log, :status => container.status, :kind => :log
       end
       

data/lib/stella/engine.rb

@@ -84,17 +84,20 @@ end
 
 class Stella::Testrun < Storable
   CLIENT_LIMIT = 1000
+  GRANULARITY = 5
   include Gibbler::Complex
   field :id => String, &gibbler_id_processor
   field :status => String
   field :userid => String
   field :start_time => Integer
+  field :end_time => Integer
   field :clients => Integer
   field :duration => Integer
   field :arrival => Float
   field :repetitions => Integer
   field :wait => Float
   field :nowait => TrueClass
+  field :granularity => Integer
   field :withparam => TrueClass
   field :withheader => TrueClass
   field :notemplates => TrueClass
@@ -109,13 +112,32 @@ class Stella::Testrun < Storable
   gibbler :plan, :hosts, :mode, :clients, :duration, :repetitions, :wait, :start_time, :userid
   def initialize(plan=nil, opts={})
     @plan = plan
+    @granularity = GRANULARITY
     process_options! opts if !plan.nil? && !opts.empty?
     reset_stats
   end
   def id
-    @id || self.digest
+    Gibbler::Digest.new(@id || self.digest)
+  end
+  def running?
+    (self.status.to_s == "running")
+  end
+  def done?
+    (self.status.to_s == "done")
+  end
+  def new?
+    (self.status.to_s == "new")
+  end
+  def pending?
+    (self.status.to_s == "pending")
   end
   def has_log?() !@log.nil? && !@log.empty? end
+  def elapsed_seconds
+    return 0 if @start_time.nil? || @start_time <= 0
+    return Time.now.utc.to_i - @start_time if @end_time.nil? || @end_time <= 0
+    @end_time - @start_time
+  end
+  
   def self.from_hash(hash={})
     me = super(hash)
     me.plan = Stella::Testplan.from_hash(me.plan)
@@ -124,7 +146,7 @@ class Stella::Testrun < Storable
     me.samples.collect! do |sample|
       Stella::Testrun::Sample.from_hash(sample)
     end
-
+    
     me.plan.usecases.uniq.each_with_index do |uc,i| 
       uc.requests.each do |req| 
         me.events.each_with_index do |event,idx|  # do_request, etc...

data/stella.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "0.8.3.002"
+  s.version = "0.8.4.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-19}
   s.default_executable = %q{stella}
   s.description = %q{Blame Stella for breaking your web application!}
   s.email = %q{delano@solutious.com}
@@ -98,24 +98,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gibbler>, [">= 0.7.4"])
+      s.add_runtime_dependency(%q<gibbler>, [">= 0.7.6"])
       s.add_runtime_dependency(%q<drydock>, [">= 0.6.9"])
-      s.add_runtime_dependency(%q<benelux>, [">= 0.5.11"])
+      s.add_runtime_dependency(%q<benelux>, [">= 0.5.12"])
       s.add_runtime_dependency(%q<sysinfo>, [">= 0.7.3"])
       s.add_runtime_dependency(%q<storable>, [">= 0.6.4"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
-      s.add_dependency(%q<gibbler>, [">= 0.7.4"])
+      s.add_dependency(%q<gibbler>, [">= 0.7.6"])
       s.add_dependency(%q<drydock>, [">= 0.6.9"])
-      s.add_dependency(%q<benelux>, [">= 0.5.11"])
+      s.add_dependency(%q<benelux>, [">= 0.5.12"])
       s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
       s.add_dependency(%q<storable>, [">= 0.6.4"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gibbler>, [">= 0.7.4"])
+    s.add_dependency(%q<gibbler>, [">= 0.7.6"])
     s.add_dependency(%q<drydock>, [">= 0.6.9"])
-    s.add_dependency(%q<benelux>, [">= 0.5.11"])
+    s.add_dependency(%q<benelux>, [">= 0.5.12"])
     s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
     s.add_dependency(%q<storable>, [">= 0.6.4"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.002
+  version: 0.8.4.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-03-19 00:00:00 -04:00
 default_executable: stella
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.11
+        version: 0.5.12
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo