rhoconnect 3.0.5 → 3.0.6

data/bench/lib/bench/bench_result_processor.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'yaml'
+require 'gruff'
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..','lib'))
+require 'bench'
+
+# 1) load all result YAML files
+current_dir = Dir.pwd
+results_dir = ARGV[0]
+if results_dir.nil?
+  puts "Bench Result Processor: No result directory is provided - Skipping ..."
+  exit(1)
+end
+Dir.chdir results_dir
+results_dir = Dir.pwd
+
+Dir.chdir current_dir
+output_dir = ARGV[1]
+output_dir ||= 'images'
+begin
+  Dir.mkdir output_dir
+rescue
+end 
+Dir.chdir output_dir
+output_dir = Dir.pwd
+
+# load meta.yaml
+meta_hash = YAML.load_file("#{results_dir}/meta.yml") if File.exists?("#{results_dir}/meta.yml")
+if meta_hash.nil?
+  puts "Bench Result Processor: No valid meta.yml file is found in the result directory - Skipping ..."
+  exit(1)
+end
+
+@metrics = meta_hash[:metrics]
+if @metrics.nil?
+  puts "Bench Result Processor: No valid metrics are found in the result directory - Skipping ..."
+  exit(1)
+end
+
+if meta_hash[:x_keys].nil?
+  puts "Bench Result Processor: No valid x_keys are found in the result directory - Skipping ..."
+  exit(1)
+end
+@x_keys = meta_hash[:x_keys].keys
+@x_keys = @x_keys.sort_by(&Bench.sort_natural_order)
+
+# initialize graphs for each metric
+graphs = {}
+title = meta_hash[:label]
+@metrics.each do |name,index|
+  g = Gruff::Line.new
+  g.title = "#{title} (#{name})"
+  g.labels = meta_hash[:x_keys].invert
+  graphs[index] = g
+end
+
+# load all result files
+Dir.foreach(results_dir) do |entry|
+  begin
+    next unless entry =~ /bench.*result/
+    
+    res_hash = YAML.load_file(File.join(results_dir, entry))
+    next if res_hash.nil? or res_hash.empty?
+    
+    marker = entry.split('.').last.to_s
+    
+    g_data = Array.new(@metrics.size) { Array.new }
+    @x_keys.each do |x_key|
+      results = res_hash[x_key]
+      results ||= Array.new(@metrics.size, 0.0)
+      results.each_with_index do |res, index|
+        g_data[index] << ("%0.4f" % res).to_f
+      end
+    end
+    
+    graphs.each do |index, graph|
+      graph.data("#{marker}", g_data[index])
+    end
+  rescue Exception => e
+    puts " Benchmark processing resulted in Error : " + e.backtrace.join("\n")
+    throw e
+  end
+end
+
+# write out resulting graphs
+@metrics.each do |name, index|
+  puts "writing #{output_dir}/#{name}.png"
+  graphs[index].write "#{output_dir}/#{name}.png"
+end

data/bench/lib/bench/cli.rb

@@ -4,12 +4,45 @@ module Bench
   class Cli < Thor
     include Logging
     desc "start path/to/bench/script", "Start performance test"
-    def start(script,login,password='')
+    def start(script,login,password='',*params)
+      server = params[0] unless params[0].nil?
+      server ||= 'default'
+      if server != 'default'
+        Bench.base_url = server
+      end
+      Bench.result_filename = params[1] unless params[1].nil?
+      Bench.concurrency = params[2].to_i unless params[2].nil?
+      Bench.iterations = params[3].to_i unless params[3].nil?
+      Bench.datasize = params[4].to_i unless params[4].nil?
       Bench.admin_login = login
       Bench.admin_password = password
       load(script)
       Statistics.new(Bench.concurrency,Bench.iterations,
-        Bench.total_time,Bench.sessions).process.print_stats
+        Bench.total_time,Bench.start_time,Bench.end_time,Bench.sessions).process.print_stats.save_results
+      bench_log "Bench completed..."
+    end
+  end
+  
+  class DistributedCli < Thor
+    include Logging
+    desc "start path/to/bench/script", "Start performance test"
+    def start(script,login,password='',*params)
+      server = params[0] unless params[0].nil?
+      server ||= 'default'
+      if server != 'default'
+        Bench.base_url = server
+      end
+      Bench.sync_key = params[1] unless params[1].nil?
+      Bench.save_to_redis = true
+      Bench.processor_id = "#{Socket.gethostname}_#{Process.pid}"
+      Bench.concurrency = params[2].to_i unless params[2].nil?
+      Bench.iterations = params[3].to_i unless params[3].nil?
+      Bench.datasize = params[4].to_i unless params[4].nil?
+      Bench.admin_login = login
+      Bench.admin_password = password
+      load(script)
+      Statistics.new(Bench.concurrency,Bench.iterations,
+        Bench.total_time,Bench.start_time,Bench.end_time,Bench.sessions).process.print_stats.save_to_redis
       bench_log "Bench completed..."
     end
   end

data/bench/lib/bench/logging.rb

@@ -1,5 +1,7 @@
 module Bench
   module Logging
+    attr_accessor :request_logging
+    
     def log_prefix
       # FIXME: in ruby1.8:  "%d" % nil => 0
       # but in ruby 1.9.2: TypeError: can't convert nil into Integer      

data/bench/lib/bench/runner.rb

@@ -10,7 +10,7 @@ module Bench
     end
 
     def test(concurrency,iterations,&block)
-      total_time = time do
+      total_times = times do
         0.upto(concurrency - 1) do |thread_id|
           sleep rand(2)
           threads << Thread.new(block) do |t|
@@ -33,7 +33,9 @@ module Bench
         end
       end
       Bench.sessions = @sessions
-      Bench.total_time = total_time
+      Bench.total_time = total_times[0]
+      Bench.start_time = total_times[1]
+      Bench.end_time = total_times[2]
     end
 
 =begin

data/bench/lib/bench/session.rb

@@ -33,7 +33,9 @@ module Bench
           result.last_response = send(verb,url,headers)
           @last_result = result
         end
-        bench_log "#{log_prefix} #{verb.to_s.upcase.gsub(/_/,'')} #{url} #{@last_result.code} #{result.time}"      
+        if request_logging
+          bench_log "#{log_prefix} #{verb.to_s.upcase.gsub(/_/,'')} #{url} #{@last_result.code} #{result.time}"
+        end    
       rescue RestClient::Exception => e
         result.error = e
         bench_log "#{log_prefix} #{verb.to_s.upcase.gsub(/_/,'')} #{url}"      

data/bench/lib/bench/statistics.rb

@@ -2,11 +2,13 @@ module Bench
   class Statistics
     include Logging
     
-    def initialize(concurrency,iterations,total_time,sessions)
+    def initialize(concurrency,iterations,total_time,start_time,end_time,sessions)
       @sessions = sessions
       @rows = {} # row key is result.marker;
       @total_count = 0
       @total_time = total_time
+      @start_time = start_time
+      @end_time = end_time
       @concurrency,@iterations = concurrency,iterations
     end
     
@@ -16,6 +18,8 @@ module Bench
           results.each do |result|
             @rows[result.marker] ||= {}
             row = @rows[result.marker]
+            row[:times] ||= []
+            row[:times] << result.time
             row[:min] ||= 0.0
             row[:max] ||= 0.0
             row[:count] ||= 0
@@ -43,14 +47,50 @@ module Bench
       bench_log "Statistics:"
       @rows.each do |marker,row|
         bench_log "Request %-15s: min: %0.4f, max: %0.4f, avg: %0.4f, err: %d, verification err: %d" % [marker, row[:min], row[:max], average(row), row[:errors], row[:verification_errors]]
+        row[:times].sort!
+        [0.25, 0.50, 0.75, 0.9, 0.95].each do |p|
+          index = (p*(row[:times].size - 1) + 1).to_i
+          bench_log "\t#{p*100}% <= #{row[:times][index]}"
+        end
       end
       bench_log "State of MD        : #{Bench.verify_error == 0 ? true : false}"
+      bench_log "Payload (#records) : #{Bench.datasize}" unless Bench.datasize.nil?
       bench_log "Concurrency        : #{@concurrency}"
       bench_log "Iterations         : #{@iterations}"
       bench_log "Total Count        : #{@total_count}"
       bench_log "Total Time         : #{@total_time}"
+      bench_log "Av.Time            : #{average(@rows[Bench.main_marker])}" unless Bench.main_marker.nil?
       bench_log "Throughput(req/s)  : #{@total_count / @total_time}"
       bench_log "Throughput(req/min): #{(@total_count / @total_time) * 60.0}"
+      self
+    end
+    
+    def save_results
+      return self if Bench.result_filename.nil?
+      
+      res_hash = YAML.load_file(Bench.result_filename) if File.exist?(Bench.result_filename)
+      res_hash ||= {}
+      res_hash[@concurrency.to_s] = [@total_count/@total_time]
+      res_hash[@concurrency.to_s] << average(@rows[Bench.main_marker]) unless Bench.main_marker.nil?
+      File.open(Bench.result_filename, 'w' ) do |file|
+        file.write res_hash.to_yaml unless res_hash.empty?
+      end
+      self
+    end
+    
+    # save session times into redis doc
+    def save_to_redis
+      return self unless Bench.save_to_redis
+      
+      stats = {}
+      throughput_data = {:start_time => @start_time.to_f,
+                         :end_time => @end_time.to_f, 
+                         :count => @total_count}
+      times_data = @rows[Bench.main_marker][:times] unless Bench.main_marker.nil?
+      stats[Bench.processor_id] = {:payload => Bench.datasize, :times => times_data.join(',')}
+      stats[Bench.processor_id].merge!(throughput_data)
+      Bench.set_server_state("bench_statistics_data",stats,true)
+      self
     end
   end
 end

data/bench/lib/bench/timer.rb

@@ -6,5 +6,12 @@ module Bench
       end_time = Time.now   
       end_time.to_f - start.to_f
     end
+    
+    def times
+      start = Time.now
+      yield
+      end_time = Time.now   
+      [end_time.to_f - start.to_f, start, end_time]
+    end
   end
 end

data/bench/lib/bench/utils.rb

@@ -2,6 +2,14 @@ module Bench
   module Utils
     include Logging
     
+    def sort_natural_order(nocase=false)
+      proc do |str|
+        i = true
+        str = str.upcase if nocase
+        str.gsub(/\s+/, '').split(/(\d+)/).map {|x| (i = !i) ? x.to_i : x}
+      end
+    end
+    
     def compare(name1,s1,name2,s2)
       r1 = diff([],name1,s1,name2,s2)
       r2 = diff([],name2,s2,name1,s1)

data/bench/lib/bench.rb

@@ -1,5 +1,4 @@
 require 'rest_client'
-require 'json'
 require 'zip/zip'
 $:.unshift File.dirname(__FILE__)
 require 'bench/timer'
@@ -27,9 +26,13 @@ module Bench
 
     attr_accessor :concurrency, :iterations, :admin_login 
     attr_accessor :admin_password, :user_name
-    attr_accessor :password, :host, :base_url, :token
+    attr_accessor :password, :base_url, :host, :token
     attr_accessor :total_time, :sessions, :verify_error
-    attr_accessor :adapter_name
+    attr_accessor :adapter_name, :datasize, :result_filename
+    attr_accessor :main_marker, :start_time, :end_time
+    
+    # these attributes for distributed testing
+    attr_accessor :processor_id, :save_to_redis, :sync_key
     
     def config
       begin
@@ -41,13 +44,30 @@ module Bench
       end
     end
     
+    def synchronize
+      begin
+        yield self
+      rescue Exception => e
+        puts "error in synchronize: #{e.inspect}"
+        raise e
+      end
+    end
+    
     def get_server_state(doc)
       token = get_token
+      params = {:api_token => token, :doc => doc}
       @body = RestClient.post("#{@host}/api/source/get_db_doc",
-        {:api_token => token, :doc => doc}.to_json, :content_type => :json)
+        params.to_json, :content_type => :json)
       JSON.parse(@body.to_s)
     end
     
+    def get_server_value(doc)
+      token = get_token
+      params = {:api_token => token, :doc => doc, :data_type => 'string'}
+      @body = RestClient.post("#{@host}/api/source/get_db_doc",
+        params.to_json, :content_type => :json)
+    end
+    
     def reset_app
       RestClient.post("#{@host}/api/admin/reset",{:api_token => get_token}.to_json, :content_type => :json)
     end
@@ -60,10 +80,14 @@ module Bench
           :content_type => :json)
     end
     
-    def set_server_state(doc,data)
+    def set_server_state(doc,data,append=false)
       token = get_token
+      params = {:api_token => token, :doc => doc, :data => data, :append => append}
+      if data.is_a? String
+        params[:data_type] = 'string'
+      end
       RestClient.post("#{@host}/api/source/set_db_doc",
-        {:api_token => token, :doc => doc, :data => data}.to_json, :content_type => :json)
+        params.to_json, :content_type => :json)
     end
     
     def reset_refresh_time(source_name,poll_interval=nil)
@@ -84,9 +108,11 @@ module Bench
     end
     
     def get_test_server(app_name = nil)
-      app_name = 'benchapp' unless app_name
-      load_settings(File.join(File.dirname(__FILE__),'..',app_name,'settings','settings.yml'))
-      @base_url = $settings[:development][:syncserver].gsub(/\/$/,'')
+      if @base_url.nil?
+        app_name = 'benchapp' unless app_name
+        load_settings(File.join(File.dirname(__FILE__),'..',app_name,'settings','settings.yml'))
+        @base_url = $settings[:development][:syncserver].gsub(/\/$/,'')
+      end
       uri = URI.parse(@base_url)
       port = (uri.port and uri.port != 80) ? ":"+uri.port.to_s : "" 
       @host = "#{uri.scheme}://#{uri.host}#{port}"

data/bench/lib/testdata/10-data.txt

@@ -0,0 +1,15 @@
+{"%ba6ae657fdb945dbb31a9e88901c34e3{"
+Email"collin@hotmail.com"%ec3b697c638f451f91271f15a162d4c4{@"	Mraz@
+"Distribution Worker@"
+Jessy@"254-249-0520 x823@"Morar, Turner and Witting@"%ec3b697c638f451f91271f15a162d4c4@"wilfred@gmail.com"%433f0607f695480ca8fb2ed62288274b{@"
+"Technical Vice President@"Leilani@"609.739.2116 x33454@"
+"Banking Superintendent@"Heaven@"(205)937-2087@"Williamson Inc@"%8c115ca8f13e4dabb5bdf9bd49ae09f7@"stan@gmail.com"%8714f3ee057a4f81907e23b2ae861a41{@"Stanton@
+"Chief Mechanic@"Priscilla@"(049)684-9908@"McGlynn-Paucek@"%8714f3ee057a4f81907e23b2ae861a41@"edgar@hotmail.com"%4d9d94c8c89e45f19e6f526d0e325da8{@"
+Lesch@
+"Electronics Nurse@"
+"Quality Assurance Director@"Nia@"263-570-9397@"Braun Inc@"%fe2b4da2487e43eab2c51937867c0038@"ora.hackett@hotmail.com"%d1329cb0bda747a8a3027cde2bfb0a2c{@"Sporer@
+"Head Technologist@"
+Issac@"(604)041-1675 x977@"Stroman Inc@"%d1329cb0bda747a8a3027cde2bfb0a2c@"mozell@hotmail.com"%5d0c8ab731d3455baf098cfa4520b725{@"Padberg@
+"Administrative Mechanic@"
+Tyler@"(184)117-5343 x276@"Brown-Jacobson@"%5d0c8ab731d3455baf098cfa4520b725@"janelle@hotmail.com"%ff296946a04647d7ad8cad315a370d88{@"Volkman@
+"&Advertising Production Supervisor@"

data/bench/lib/testdata/2-data.txt

@@ -0,0 +1,3 @@
+{"%20fe532915594c9db5433e1378df5dfb{"
+Email"solon.gottlieb@yahoo.com"%e0af7f86a53c471aacc3da73821c7b65{@"Orn@
+"Technical Clerk@"Romaine@"1-445-379-7774@"!Nicolas, Murray and Botsford@"%e0af7f86a53c471aacc3da73821c7b65@"rickey@hotmail.com

data/bench/lib/testdata/25-data.txt

@@ -0,0 +1,39 @@
+{"%745f7eba5bdc4b5394d86704bdbb13f8{"
+Email"mya.welch@gmail.com"%b7b55988f2ba48089846d51fa29ccd3d{@"Jacobi@
+"Laboratory Clerk@"Buford@"395-947-1236@"Abbott, Mann and Casper@"%b7b55988f2ba48089846d51fa29ccd3d@"thora_beatty@yahoo.com"%72833fead8b8438b9da511601cc2bea9{@"Hilpert@
+"Distribution Planner@"
+Cesar@"845-974-3924@"Crooks and Sons@"%72833fead8b8438b9da511601cc2bea9@"jacynthe.erdman@gmail.com"%2b9d52a78eac41be91184d5c90f1a71a{@"Kerluke@
+"Production Technologist@"Marcellus@"462.764.4095 x0038@"!Hermann, Stanton and Stroman@"%2b9d52a78eac41be91184d5c90f1a71a@"layne@gmail.com"%0743364453504b91bb747790ac67cfaa{@"
+"Maintenance Supervisor@"Vivian@"748-079-4465@"Weissnat LLC@"%0743364453504b91bb747790ac67cfaa@"napoleon.beier@hotmail.com"%313ff12bbdf847ff9ae46196361c6a06{@"
+Wolff@
+"%Quality Assurance Superintendent@"	Judy@"1-646-220-9427@"Pagac, Kshlerin and Jast@"%313ff12bbdf847ff9ae46196361c6a06@"#constantin_lockman@hotmail.com"%719c6bda435f4402ae054e00a5488ec0{@"Kemmer@
+"Chief Supervisor@"Mozell@"1-687-357-4506 x2642@"Becker LLC@"%719c6bda435f4402ae054e00a5488ec0@"mossie@hotmail.com"%f60acc705f774a7db82614a8379aaf89{@"Durgan@
+"#Computer Production Supervisor@"	Emma@"(807)711-1773@"O'Kon-Ernser@"%f60acc705f774a7db82614a8379aaf89@"maybelle@gmail.com"%677e0cb3e4774214891a75ce8c7d2186{@"
+Ebert@
+"Medical Helper@"Adaline@"1-829-209-7633@"
+"Maintenance Mechanic@"
+Keith@"238-580-8865 x3897@"Kuphal-Kautzer@"%a18a521497ba470fbc33105a411f8086@"grover@gmail.com"%11774584e300418fa7e756ab019653f8{@"	Hane@
+",Quality Assurance Production Supervisor@"
+Zoila@"1-874-687-3044@"Morar-Schmitt@"%11774584e300418fa7e756ab019653f8@" daphney_mueller@hotmail.com"%34e7aa9a287d456f9039b319286dc5fb{@"Douglas@
+"Financial Director@"Damian@"915.644.9796 x73099@"Glover, Hand and Lueilwitz@"%34e7aa9a287d456f9039b319286dc5fb@"luz.nicolas@yahoo.com"%579b4154f352499fbbbd94a9dbf74123{@"
+"Assistant Director@"Yolanda@"(149)019-1565@"Kling, DuBuque and Fahey@"%579b4154f352499fbbbd94a9dbf74123@" joanie_thompson@hotmail.com"%40ec578ade8b47d7afb021ee76a9918a{@"	Lang@
+" Quality Assurance Executive@"	Lula@"1-027-576-0242 x26553@"Rempel Inc@"%40ec578ade8b47d7afb021ee76a9918a@"peter@gmail.com"%1374a69e9cb44e5d8a9718afef48319e{@"Abernathy@
+"!Environmental Superintendent@"Thelma@"681.351.3293@"%Williamson, Schmeler and Reichel@"%1374a69e9cb44e5d8a9718afef48319e@"ryann@gmail.com"%04976051884044b3898b432df5bf5d2c{@"Douglas@
+"Banking Engineer@"Meghan@"179-501-0324@"!Schaefer, Bogisich and Bogan@"%04976051884044b3898b432df5bf5d2c@"collin_halvorson@yahoo.com"%f0f02fad738442168cca3c86e759b523{@"Ankunding@
+"Maintenance Foreman@"	Sean@"1-841-705-6222@"Runolfsdottir-Vandervort@"%f0f02fad738442168cca3c86e759b523@" lauretta_glover@hotmail.com"%76f4ec2512b646a8ac9bbd858bd97461{@"Legros@
+"Production Helper@"
+Marta@"(113)776-0880 x1162@"Cummerata Group@"%76f4ec2512b646a8ac9bbd858bd97461@"jacky_ernser@yahoo.com"%28d1f8d66d6442388d4877414365696a{@"VonRueden@
+"Electronics Clerk@"
+Fiona@"(520)711-6249 x75737@"Borer, Lemke and Schuppe@"%28d1f8d66d6442388d4877414365696a@"bennie@hotmail.com"%e7104e868fd74ef9a2863cc24459a1c9{@"Zemlak@
+"Distribution Supervisor@"Hester@"743-122-4646 x2642@"Daugherty Group@"%e7104e868fd74ef9a2863cc24459a1c9@"shaina.jenkins@gmail.com"%0c83cd53e06b4eac8312463bae2e1663{@"
+Ortiz@
+"Assistant Technician@"
+"General Recruiter@"Danial@"1-651-973-7918 x6691@"Gaylord LLC@"%f636bcdd6af841269dd63d3d6ccc1f79@"pearl@gmail.com"%d15e38056def43d8ae7d3f233bcb6abc{@"
+Terry@
+"Distribution Helper@"
+Juana@"(870)146-6842 x777@"'Schuppe, Wintheiser and Hodkiewicz@"%d15e38056def43d8ae7d3f233bcb6abc@"raheem@gmail.com"%e0a892ff16a544f4b6d510b017448386{@"
+Welch@
+"Chief Buyer@"Jay@"(544)927-7766@"Bins-Beer@"%e0a892ff16a544f4b6d510b017448386@"neal.wyman@hotmail.com"%708d263cde3d456895b554a784b15b33{@"
+Hintz@
+"Production Vice President@"
+Aylin@"214-142-6776 x691@" Luettgen, Volkman and Bosco@"%708d263cde3d456895b554a784b15b33@"malika@gmail.com