stresser 0.3.2 → 0.4.0

data/HISTORY.markdown

@@ -0,0 +1,3 @@
+## 0.4
+ - added 'started at' column to csv export
+ - refactored options pasing in stresser bin to match stresser-grapher and stresser-loggen

data/README.markdown

@@ -100,6 +100,10 @@ as often as you like:
 
 The `{{n}}` will be replaced with the numbers 0-99.
 
+## Tests
+Run `rake spec` to run them tests. Currently, only httperf's output of a session based
+replay log is parsed, but I will add more.
+
 ## Thanks
 
 Stresser is based on igvita's autoperf driver for httperf.

data/Rakefile

@@ -47,9 +47,17 @@ task :default => :test
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "stresser #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+
+require 'spec/rake/spectask'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+end
+

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/bin/stresser

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
 require 'mp_perf'
 
+
 trap("INT") {
   puts "Terminating tests."
   Process.exit

data/bin/stresser-grapher

@@ -23,7 +23,7 @@ EOS
         :type => String
 end.merge(:csv_file => ARGV.last)
   
-Trollop::die :output_dir,  "must be writeable"   unless opts[:output_dir] and File.stat(opts[:output_dir]).writable? 
+Trollop::die :output_dir, "must be writeable"    unless opts[:output_dir] and File.stat(opts[:output_dir]).writable? 
 Trollop::die :output_dir, "must be a directory"  unless opts[:output_dir] and File.stat(opts[:output_dir]).directory?
 
 Grapher.generate_reports(opts)

data/lib/httperf.rb

@@ -2,11 +2,12 @@ module Httperf
   extend self
 
   def run(conf)
-    res = Hash.new ""
+    res = Hash["started at", Time.now]
+
     httperf_opt = conf.keys.grep(/httperf/).collect {|k| "--#{k.gsub(/httperf_/, '')}=#{conf[k]}"}.join(" ")
     httperf_cmd = "httperf --hog --server=#{conf['host']} --port=#{conf['port']} #{httperf_opt}"
     IO.popen("#{httperf_cmd} 2>&1") do |pipe|
-      res = parse_output(pipe)
+      res.merge! parse_output(pipe)
 
       # Now calculate the amount of stati per second
       (1..5).each do |i|

data/lib/mp_perf.rb

@@ -1,6 +1,8 @@
 require 'optparse'
 require 'ruport'
 require 'httperf'
+require 'trollop'
+
 
 #
 #  Takes command line options and attempts to make a benchmark.
@@ -8,29 +10,33 @@ require 'httperf'
 class MPPerf
 
   def initialize(opts = {})
-    @conf = {}
-    OptionParser.new do |opts|
-      opts.banner = "Usage: stresser -c your.conf -o output.csv"
-      opts.on("-o", "--output FILE", String, "This file will be overwritten with a detailed report of the stresstest") do |v|
-        @output_file = v
-      end
-      opts.on( "-c", "--config FILE", String, "Your stresser configuration file with stresstest options and parameters directly passed to httperf") do |v|
-        @conf = parse_config(v)
-      end
-    end.parse!
+    parse_options
+    parse_config
+    run_suite
+    display_hints
+  end
 
-    run()
+  #
+  # Parse command line options
+  #
+  def parse_options
+    @conf = Trollop::options do
+      banner = MPPerf.options_banner
+      opt :output_file, "The name of the csv file to write the results to. Warning: overwrites that file!",
+                        :type => String
+      opt :config_file, "The name of the .conf file defining your testsuite. See http://github.com/moviepilot/stresser",
+                        :type => String
+    end
 
-    puts "~"*80
-    puts "Great, now create a graph with"
-    puts "  stresser-grapher -o #{File.expand_path(File.dirname(@output_file))} #{@output_file}"
-    puts ""
+    Trollop::die :output_file, "must be a writeable file" unless @conf[:config_file]
+    Trollop::die :config_file, "must be a readable file"  unless @conf[:config_file]
   end
 
   #
   # Taken from http://github.com/igrigorik/autoperf
   #
-  def parse_config(config_file)
+  def parse_config
+    config_file = @conf[:config_file]
     raise Errno::EACCES, "#{config_file} is not readable" unless File.readable?(config_file)
 
     conf = {}
@@ -56,7 +62,7 @@ class MPPerf
       end
     }
 
-    return conf
+    @conf.merge! conf
   end
 
   #
@@ -71,7 +77,7 @@ class MPPerf
     return res
   end
 
-  def run
+  def run_suite
     results = {}
     report = nil
     (@conf['low_rate']..@conf['high_rate']).step(@conf['rate_step']) do |rate|
@@ -94,9 +100,23 @@ class MPPerf
     end
 
     # Write csv
-    File.new(@output_file, "w").puts report.to_csv unless report.nil?
+    File.new(@conf[:output_file], "w").puts report.to_csv unless report.nil?
+  end
+  
+  def display_hints
+    puts "~"*80
+    puts "Great, now create a graph with"
+    puts "  stresser-grapher -o #{File.expand_path(File.dirname(@conf[:output_file]))} #{@conf[:output_file]}"
+    puts ""
   end
-end
-
 
+  def self.options_banner
+    <<BANNER
+Runs a stresstest defined in a config file and write the results to a csv file.
 
+Usage:
+      stresser -c my_config_file -o results.csv
+where options are:
+BANNER
+  end
+end

data/sample.conf

@@ -1,9 +1,9 @@
 # MPPerf Configuration File
 
 # The host, URI (relative to the document root) and port to test.
-host = www.intern.moviepilot.de 
+host = localhost
 uri  = /
-port = 12001
+port = 80 
 
 # The 'rate' is the number of number of connections to open per second.
 # A series of tests will be conducted, starting at low rate,

data/spec/lib/httperf_spec.rb

@@ -4,126 +4,137 @@ describe Httperf do
 
   describe "parsing httperf output" do
 
-    before(:all) do
-      @pipe = File.open("spec/httperf_output.txt") 
-      @〉 = Httperf.parse_output(@pipe)
+    before(:each) do
+      @pipe = File.open("spec/httperf_session_based_output.txt") 
+      Time.stub!(:now).and_return "Tue Nov 30 15:49:08 0100 2010"
+      
+      #
+      # The friendly snail is greeting you!
+      #
+      IO.should_receive(:popen).and_yield @pipe
+      @⚋♉ = Httperf.run({})
     end
 
     it "should parse the 'Total' line correctly" do
-      @〉['conns'].should    == 500
-      @〉['requests'].should == 600
-      @〉['replies'].should  == 300
-      @〉['duration'].should == 50.354
+      @⚋♉['conns'].should    == 500
+      @⚋♉['requests'].should == 600
+      @⚋♉['replies'].should  == 300
+      @⚋♉['duration'].should == 50.354
     end
 
     it "should parse the 'Connection rate' line correctly" do
-      @〉['conn/s'].should == 9.9
-      @〉['ms/connection'].should == 100.7
-      @〉['concurrent connections max'].should == 8
+      @⚋♉['conn/s'].should == 9.9
+      @⚋♉['ms/connection'].should == 100.7
+      @⚋♉['concurrent connections max'].should == 8
     end
     
     it "should parse the 'Connection time' line correctly" do
-      @〉['conn time min'].should    == 449.7
-      @〉['conn time avg'].should    == 465.1
-      @〉['conn time max'].should    == 2856.6
-      @〉['conn time median'].should == 451.5
-      @〉['conn time stddev'].should == 132.1
+      @⚋♉['conn time min'].should    == 449.7
+      @⚋♉['conn time avg'].should    == 465.1
+      @⚋♉['conn time max'].should    == 2856.6
+      @⚋♉['conn time median'].should == 451.5
+      @⚋♉['conn time stddev'].should == 132.1
     end
 
     it "should parse the second 'Connection time' line correctly" do
-      @〉['conn time connect'].should == 74.1
+      @⚋♉['conn time connect'].should == 74.1
     end
 
     it "should parse the 'Connection length' line correctly" do
-      @〉['conn length replies/conn'].should == 1.0
+      @⚋♉['conn length replies/conn'].should == 1.0
     end
 
     it "should parse the 'Request rate' line correctly" do
-      @〉['req/s'].should == 9.9
-      @〉['ms/req'].should == 100.7
+      @⚋♉['req/s'].should == 9.9
+      @⚋♉['ms/req'].should == 100.7
     end
 
     it "should parse the 'Request size' line correctly" do
-      @〉['request size'].should == 65.0 
+      @⚋♉['request size'].should == 65.0 
     end
 
     it "should parse the 'Reply rate' line correctly" do
-      @〉['replies/s min'].should    == 9.2
-      @〉['replies/s avg'].should    == 9.9
-      @〉['replies/s max'].should    == 10.0
-      @〉['replies/s stddev'].should == 0.3
+      @⚋♉['replies/s min'].should    == 9.2
+      @⚋♉['replies/s avg'].should    == 9.9
+      @⚋♉['replies/s max'].should    == 10.0
+      @⚋♉['replies/s stddev'].should == 0.3
     end
 
     it "should parse the 'Reply time' line correctly" do
-      @〉['reply time response'].should == 88.1
-      @〉['reply time transfer'].should == 302.9
+      @⚋♉['reply time response'].should == 88.1
+      @⚋♉['reply time transfer'].should == 302.9
     end
 
     it "should parse the 'Reply size' line correctly" do
-      @〉['reply size header'].should  == 274.0
-      @〉['reply size content'].should == 54744.0
-      @〉['reply size footer'].should  == 2.0
-      @〉['reply size total'].should   == 55020.0
+      @⚋♉['reply size header'].should  == 274.0
+      @⚋♉['reply size content'].should == 54744.0
+      @⚋♉['reply size footer'].should  == 2.0
+      @⚋♉['reply size total'].should   == 55020.0
     end
 
     it "should parse the 'Reply status' line correctly" do
-      @〉['status 1xx'].should == 1 
-      @〉['status 2xx'].should == 500
-      @〉['status 3xx'].should == 3 
-      @〉['status 4xx'].should == 4
-      @〉['status 5xx'].should == 5
+      @⚋♉['status 1xx'].should == 1 
+      @⚋♉['status 2xx'].should == 500
+      @⚋♉['status 3xx'].should == 3 
+      @⚋♉['status 4xx'].should == 4
+      @⚋♉['status 5xx'].should == 5
     end
     
     it "should parse the 'CPU time' line correctly" do
-      @〉['cpu time user'].should     == 15.65
-      @〉['cpu time system'].should   == 34.65
-      @〉['cpu time user %'].should   == 31.1
-      @〉['cpu time system %'].should == 68.8
-      @〉['cpu time total %'].should  == 99.9
+      @⚋♉['cpu time user'].should     == 15.65
+      @⚋♉['cpu time system'].should   == 34.65
+      @⚋♉['cpu time user %'].should   == 31.1
+      @⚋♉['cpu time system %'].should == 68.8
+      @⚋♉['cpu time total %'].should  == 99.9
     end
 
     it "should parse the 'Net I/O' line correctly" do
-      @〉['net i/o (KB/s)'].should == 534.1
+      @⚋♉['net i/o (KB/s)'].should == 534.1
     end
 
     it "should parse the first 'Errors' line correctly" do
-      @〉['errors total'].should       == 1234
-      @〉['errors client-timo'].should == 2345
-      @〉['errors socket-timo'].should == 3456
-      @〉['errors connrefused'].should == 4567
-      @〉['errors connreset'].should   == 5678
+      @⚋♉['errors total'].should       == 1234
+      @⚋♉['errors client-timo'].should == 2345
+      @⚋♉['errors socket-timo'].should == 3456
+      @⚋♉['errors connrefused'].should == 4567
+      @⚋♉['errors connreset'].should   == 5678
     end
 
     it "should parse the second 'Errors' line correctly" do
-      @〉['errors fd-unavail'].should  == 1
-      @〉['errors addrunavail'].should == 2
-      @〉['errors ftab-full'].should   == 3
-      @〉['errors other'].should       == 4
+      @⚋♉['errors fd-unavail'].should  == 1
+      @⚋♉['errors addrunavail'].should == 2
+      @⚋♉['errors ftab-full'].should   == 3
+      @⚋♉['errors other'].should       == 4
     end
    
     it "should parse the 'Session rate' line correctly" do
-      @〉['session rate min'].should    == 35.80
-      @〉['session rate avg'].should    == 37.04
-      @〉['session rate max'].should    == 38.20
-      @〉['session rate stddev'].should == 0.98
-      @〉['session rate quota'].should  == "1000/1000"
+      @⚋♉['session rate min'].should    == 35.80
+      @⚋♉['session rate avg'].should    == 37.04
+      @⚋♉['session rate max'].should    == 38.20
+      @⚋♉['session rate stddev'].should == 0.98
+      @⚋♉['session rate quota'].should  == "1000/1000"
     end 
 
     it "should parse the 'Session' line correctly" do
-      @〉['session avg conns/sess'].should == 2.00
+      @⚋♉['session avg conns/sess'].should == 2.00
     end
 
     it "should parse the 'Session lifetime' line correctly" do
-      @〉['session lifetime [s]'].should == 0.3
+      @⚋♉['session lifetime [s]'].should == 0.3
     end
 
     it "should parse the 'Session failtime' line correctly" do
-      @〉['session failtime [s]'].should == 0.0
+      @⚋♉['session failtime [s]'].should == 0.0
     end
 
     it "should parse the 'Session length histogram' correctly" do
-      @〉['session length histogram'].should == "0 0 1000" 
+      @⚋♉['session length histogram'].should == "0 0 1000" 
     end
+
+    it "should add a started at timestamp for each rate" do
+      @⚋♉['started at'].should == "Tue Nov 30 15:49:08 0100 2010" 
+    end
+
   end
 end
 

data/stresser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stresser}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jannis Hermanns"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-11-30}
   s.description = %q{Wrapper around httperf for stresstesting your app. Runs httperf multiple times with different concurrency levels and generates an executive summary™ in .csv"}
   s.email = %q{jannis@moviepilot.com}
   s.executables = ["stresser", "stresser-grapher", "stresser-loggen"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "HISTORY.markdown",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -27,13 +28,13 @@ Gem::Specification.new do |s|
      "bin/stresser",
      "bin/stresser-grapher",
      "bin/stresser-loggen",
-     "build/stresser-0.3.2.gem",
+     "build/stresser-0.4.0.gem",
      "lib/grapher.rb",
      "lib/httperf.rb",
      "lib/mp_perf.rb",
      "lib/reports.yml",
      "sample.conf",
-     "spec/httperf_output.txt",
+     "spec/httperf_session_based_output.txt",
      "spec/lib/httperf_spec.rb",
      "spec/lib/mp_perf_spec.rb",
      "spec/spec.opts",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stresser
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jannis Hermanns
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +01:00
+date: 2010-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- HISTORY.markdown
 - LICENSE
 - README.markdown
 - Rakefile
@@ -95,13 +96,13 @@ files:
 - bin/stresser
 - bin/stresser-grapher
 - bin/stresser-loggen
-- build/stresser-0.3.2.gem
+- build/stresser-0.4.0.gem
 - lib/grapher.rb
 - lib/httperf.rb
 - lib/mp_perf.rb
 - lib/reports.yml
 - sample.conf
-- spec/httperf_output.txt
+- spec/httperf_session_based_output.txt
 - spec/lib/httperf_spec.rb
 - spec/lib/mp_perf_spec.rb
 - spec/spec.opts