drnbench 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2305ee745be0d42e86eefa96f33550ba45e36980
-  data.tar.gz: 6f2eeb52b863b766d26393c36b6356a30537e9e9
+  metadata.gz: 029ac85e0d002dfaf7636ea8031f29fd811deb42
+  data.tar.gz: dfa72f28ebe5c95ad0dfa38f3bedd124fcf4c108
 SHA512:
-  metadata.gz: 8690b02b2be5bff090909faddbcd2f5ca699ee17e230ae165b164c306dbf7a0b006bf77f3ee1c5066b3e56bedd573a4d30154e12177b835ef5e2d760910236a6
-  data.tar.gz: cfcc74f024b912dc92cafe3cc4d913367830ab1e1be72f1aa8833b4d86d46f226e4b2d05410f60ed1fabb87303376117bdf46d09c3462335162f721800a5d521
+  metadata.gz: 0c2b179e22d3acb8d4e2c3592789bb5017da991eb17e053431ce5e4a12fd7cca4f7fe4a5ac8a77a5bd5bfbaabd1752147cb8edbf0ee8a34195ae6f49c729c318
+  data.tar.gz: 97008b59cc5eb84afc94fce74f62fd89ae9e31b6bbfa1afe463c6404f062304dd8f6339c3271d9722f673491e6206b8428b60e54c3bd0dc05271300ad93d59da

data/bin/drnbench-request-response

@@ -41,6 +41,10 @@ option_parser = OptionParser.new do |parser|
             "step to increase number of clients (optional)") do |step|
     config.step = step
   end
+  parser.on("--n-slow-requests=N", Integer,
+            "number of reporting slow requests (optional)") do |n_slow_requests|
+    config.n_slow_requests = n_slow_requests
+  end
 
   parser.on("--mode=MODE", String,
             "mode of benchmark (optional)",

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.0.1: 2014-07-29
+
+ * Report throughput more correctly.
+ * Report percentages of returned HTTP statuses correctly.
+ * Report max elapsed time correctly.
+ * Add ability to report slow requests.
+ * Accept pattern group specific parameters.
+
 ## 1.0.0: 2014-01-29
 
 The first release!!!

data/lib/drnbench/chart/gnuplot.rb

@@ -0,0 +1,64 @@
+# Copyright (C) 2014  Droonga Project
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tempfile"
+
+module Drnbench
+  module Chart
+    class Gnuplot
+      def initialize
+        @input = Tempfile.new("drnbench-graph")
+        write(preamble)
+      end
+
+      def write(data)
+        @input.write(data)
+      end
+
+      def run
+        @input.close
+        unless system("gnuplot", @input.path)
+          @input.open
+          puts(@input.read)
+          @input.close
+        end
+      end
+
+      private
+      def preamble
+        <<-PREAMBLE
+set terminal pdfcairo enhanced color transparent rounded
+
+set key outside center top horizontal reverse Left samplen 2
+unset border
+set xtics scale 0
+set ytics scale 0
+set grid ytics linewidth 1 linetype -1
+
+set style line 1 lt 1 lc rgbcolor "#3465a4" lw 2.5 pt 7 ps 1
+set style line 2 lt 1 lc rgbcolor "#edd400" lw 2.5 pt 7 ps 1
+set style line 3 lt 1 lc rgbcolor "#888a85" lw 2.5 pt 5 ps 1
+set style line 4 lt 1 lc rgbcolor "#f57900" lw 2.5 pt 5 ps 1
+set style line 5 lt 1 lc rgbcolor "#ad7fa8" lw 2.5 pt 9 ps 1
+set style line 6 lt 1 lc rgbcolor "#4e9a06" lw 2.5 pt 9 ps 1
+set style line 7 lt 1 lc rgbcolor "#ef2929" lw 2.5 pt 1 ps 1
+set style line 8 lt 1 lc rgbcolor "#5c3566" lw 2.5 pt 1 ps 1
+set style line 9 lt 1 lc rgbcolor "#c17d11" lw 2.5 pt 3 ps 1
+set style line 10 lt 1 lc rgbcolor "#dce775" lw 2.5 pt 3 ps 1
+        PREAMBLE
+      end
+    end
+  end
+end

data/lib/drnbench/client/http.rb

@@ -21,6 +21,8 @@ module Drnbench
   class HttpClient
     attr_reader :requests, :results, :wait
 
+    SUPPORTED_HTTP_METHODS = ["GET", "POST"]
+
     def initialize(params, config)
       @requests = params[:requests]
       @result   = params[:result]
@@ -62,6 +64,9 @@ module Drnbench
       request["path"] ||= @config.default_path
       request["method"] ||= @config.default_method
       request["method"] = request["method"].upcase
+      unless SUPPORTED_HTTP_METHODS.include?(request["method"])
+        request["method"] = "GET"
+      end
       request
     end
   end

data/lib/drnbench/reporters/throughput-reporter.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2014  Droonga Project
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "tempfile"
+require "fileutils"
+
+require "drnbench/chart/gnuplot"
+
+module Drnbench
+  module Reporters
+    class ThroughputReporter
+      def initialize(label)
+        @label = label
+        @data_file = Tempfile.new("drnbench-throughput-data")
+      end
+
+      def add_data(time, qps)
+        @data_file.puts([time, qps].join("\t"))
+      end
+
+      def report(output_directory)
+        FileUtils.mkdir_p(output_directory)
+        generate_chart(output_directory)
+      end
+
+      private
+      def generate_chart(output_directory)
+        @data_file.flush
+        gnuplot = Chart::Gnuplot.new
+        gnuplot.write(<<-INPUT)
+set output "#{output_directory}/throughput.pdf"
+set title "Throughput"
+
+set xlabel "Time (second)"
+set ylabel "Queries per Second (qps)"
+plot "#{@data_file.path}" using 1:2 with linespoints linestyle 1 \\
+   title "#{@label}"
+        INPUT
+        gnuplot.run
+      end
+    end
+  end
+end

data/lib/drnbench/request-response/configuration.rb

@@ -19,7 +19,7 @@ module Drnbench
   module RequestResponse
     class Configuration
       attr_accessor :duration, :wait, :request_patterns_file
-      attr_accessor :start_n_clients, :end_n_clients, :step, :n_requests
+      attr_accessor :start_n_clients, :end_n_clients, :step, :n_requests, :n_slow_requests
       attr_accessor :mode
       attr_accessor :default_host, :default_port, :default_path, :default_method
       attr_accessor :report_progressively, :output_path
@@ -34,6 +34,7 @@ module Drnbench
         @step                 = 1
         @n_requests           = 1000
         @mode                 = :http
+        @n_slow_requests      = 5
 
         @default_host         = "localhost"
         @default_port         = 80

data/lib/drnbench/request-response/gradual-runner.rb

@@ -41,6 +41,7 @@ module Drnbench
           benchmark.run
           if @config.report_progressively
             puts benchmark.result.to_s
+            puts ""
           end
           @result << benchmark.result
         end
@@ -78,7 +79,7 @@ module Drnbench
         end
 
         def csv_header
-          Drnbench::Result.keys + statuses
+          Drnbench::RequestResponse::Result.keys + statuses
         end
 
         def csv_body

data/lib/drnbench/request-response/result.rb

@@ -16,7 +16,8 @@
 module Drnbench
   module RequestResponse
     class Result
-      attr_reader :n_clients, :duration, :statuses
+      attr_reader :n_clients, :statuses, :n_slow_requests
+      attr_accessor :duration
 
       class << self
         def keys
@@ -34,6 +35,7 @@ module Drnbench
       def initialize(params)
         @n_clients = params[:n_clients]
         @duration = params[:duration]
+        @n_slow_requests = params[:n_slow_requests] || 5
 
         @results = []
         @total_elapsed_time = 0.0
@@ -70,13 +72,27 @@ module Drnbench
       end
 
       def max_elapsed_time
-        @max_elapsed_time ||= @elapsed_times.min
+        @max_elapsed_time ||= @elapsed_times.max
       end
 
       def average_elapsed_time
         @average_elapsed_time ||= @total_elapsed_time / @elapsed_times.size
       end
 
+      def top_slow_requests
+        slow_requests[0..@n_slow_requests-1].collect do |result|
+          request = result[:request]
+          "#{result[:elapsed_time]} sec: " +
+            "#{request["method"]} http://#{request["host"]}:#{request["port"]}#{request["path"]}"
+        end
+      end
+
+      def slow_requests
+        @results.sort do |a, b|
+          b[:elapsed_time] <=> a[:elapsed_time]
+        end
+      end
+
       def to_s
         "Total requests: #{total_n_requests} " +
           "(#{queries_per_second} queries per second)\n" +
@@ -87,7 +103,11 @@ module Drnbench
         "Elapsed time:\n" +
         "  min:     #{min_elapsed_time} sec\n" +
         "  max:     #{max_elapsed_time} sec\n" +
-        "  average: #{average_elapsed_time} sec"
+        "  average: #{average_elapsed_time} sec\n" +
+        "Top #{@n_slow_requests} slow requests:\n" +
+        top_slow_requests.collect do |request|
+          "  #{request}"
+        end.join("\n")
       end
 
       def values
@@ -116,11 +136,11 @@ module Drnbench
         status_percentages.sort! do |a, b|
           (-1) * (a[:percentage] <=> b[:percentage])
         end
-        status_percentages = {}
+        final_status_percentages = {}
         status_percentages.each do |status|
-          status_percentages[status[:status]] = status[:percentage]
+          final_status_percentages[status[:status]] = status[:percentage]
         end
-        status_percentages
+        final_status_percentages
       end
     end
   end

data/lib/drnbench/request-response/runner.rb

@@ -23,6 +23,7 @@ module Drnbench
       attr_reader :n_clients, :result
 
       def initialize(n_clients, config)
+        n_clients = 1 if n_clients.zero?
         @n_clients = n_clients
         @config = config
         populate_requests
@@ -36,8 +37,13 @@ module Drnbench
       private
       def process_requests
         requests_queue = Queue.new
+        @requests.each do |request|
+          requests_queue.push(request)
+        end
+
         @result = Result.new(:n_clients => @n_clients,
-                             :duration => @config.duration)
+                             :duration => @config.duration,
+                             :n_slow_requests => @config.n_slow_requests)
 
         client_params = {
           :requests => requests_queue,
@@ -59,12 +65,12 @@ module Drnbench
 
         start_time = Time.now
         while Time.now - start_time < @config.duration
+          sleep 1
           if requests_queue.empty?
-            @requests.each do |request|
-              requests_queue.push(request)
-            end
+            puts "WORNING: requests queue becomes empty! (#{Time.now - start_time} sec)"
+            @result.duration = Time.now - start_time
+            break
           end
-          sleep 1
         end
 
         @clients.each do |client|
@@ -92,7 +98,7 @@ module Drnbench
 
       def populate_request_pattern(request_pattern)
         frequency = request_pattern["frequency"].to_f
-        n_requests = @config.n_requests * frequency
+        n_requests = @config.n_requests * @config.end_n_clients * frequency
 
         base_patterns = nil
         if request_pattern["pattern"]
@@ -103,7 +109,11 @@ module Drnbench
         base_patterns = base_patterns.shuffle
 
         n_requests.round.times do |count|
-          @requests << base_patterns[count % base_patterns.size]
+          pattern = base_patterns[count % base_patterns.size]
+          pattern["host"] ||= request_pattern["host"]
+          pattern["port"] ||= request_pattern["port"]
+          pattern["method"] ||= request_pattern["method"]
+          @requests << pattern
         end
       end
     end

data/lib/drnbench/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Drnbench
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drnbench
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - YUKI Hiroshi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -114,8 +114,8 @@ email:
 - yuki@clear-code.com
 - kou@clear-code.com
 executables:
-- drnbench-publish-subscribe
 - drnbench-request-response
+- drnbench-publish-subscribe
 extensions: []
 extra_rdoc_files: []
 files:
@@ -125,23 +125,25 @@ files:
 - drnbench.gemspec
 - LICENSE.txt
 - doc/text/news.md
-- lib/drnbench.rb
-- lib/drnbench/request-response/result.rb
+- lib/drnbench/client/http.rb
+- lib/drnbench/client/http-droonga.rb
+- lib/drnbench/request-response/gradual-runner.rb
 - lib/drnbench/request-response/configuration.rb
+- lib/drnbench/request-response/result.rb
 - lib/drnbench/request-response/runner.rb
-- lib/drnbench/request-response/gradual-runner.rb
+- lib/drnbench/reporters/throughput-reporter.rb
+- lib/drnbench/version.rb
+- lib/drnbench/chart/gnuplot.rb
 - lib/drnbench/publish-subscribe/watch.rb
+- lib/drnbench/publish-subscribe/gradual-runner.rb
 - lib/drnbench/publish-subscribe/configuration.rb
 - lib/drnbench/publish-subscribe/runner.rb
-- lib/drnbench/publish-subscribe/gradual-runner.rb
-- lib/drnbench/version.rb
-- lib/drnbench/client/http-droonga.rb
-- lib/drnbench/client/http.rb
 - lib/drnbench/server/protocol-adapter.rb
-- lib/drnbench/server/configuration.rb
 - lib/drnbench/server/engine.rb
-- bin/drnbench-publish-subscribe
+- lib/drnbench/server/configuration.rb
+- lib/drnbench.rb
 - bin/drnbench-request-response
+- bin/drnbench-publish-subscribe
 homepage: https://github.com/groonga/grntest
 licenses:
 - GPLv3 or later