perfmonger 0.9.0 → 0.10.1

data/lib/perfmonger/command/fingerprint.rb

@@ -101,9 +101,18 @@ EOS
         save_dmidecode_info()
       end
 
+      do_with_message("Saving biosdecode info") do
+        save_biosdecode_info()
+      end
+
+      do_with_message("Saving nvme info") do
+        save_nvme_info()
+      end
+
 
       ## Collect vendor specific info
 
+
       # LSI MegaRAID
       megacli_bin = "/opt/MegaRAID/MegaCli/MegaCli64"
       if File.executable?(megacli_bin) && Process::UID.rid == 0
@@ -271,31 +280,79 @@ EOS
   end
 
   def save_device_info()
-    (Dir.glob('/sys/block/sd*') +
-     Dir.glob('/sys/block/xvd*')).each do |sd_dev|
-      File.open("#{@output_dir}/block-#{File.basename(sd_dev)}.log", "w") do |f|
-        f.puts("## ls -l #{sd_dev}")
-        f.puts(`ls -l #{sd_dev}`)
+    # list of file pattern regexps which cannot be read
+    blacklists = [
+                  %r|device/sw_activity$|,
+                  %r|trace/pid$|,
+                  %r|trace/end_lba$|,
+                  %r|trace/enable$|,
+                  %r|trace/act_mask$|,
+                  %r|trace/start_lba$|,
+                  %r|trace/pid$|,
+                  %r|trace/end_lba$|,
+                  %r|trace/act_mask$|,
+                  %r|power/autosuspend_delay_ms$|,
+                  %r|device/unload_heads$|,
+                  %r|device/vpd_pg80$|,
+                  %r|device/vpd_pg83$|,
+                 ]
+
+    Dir.glob('/sys/block/*').each do |blockdev|
+      if File.basename(blockdev) =~ /^(loop|ram)/
+        next
+      end
+
+      devname = File.basename(blockdev)
+
+      File.open("#{@output_dir}/block-#{File.basename(blockdev)}.log", "w") do |f|
+        f.puts("## ls -l #{blockdev}")
+        f.puts(`ls -l #{blockdev}`)
         f.puts("")
-        ['device/queue_depth',
-         'device/queue_type',
-         'device/iorequest_cnt',
-         'device/vendor',
-         'queue/scheduler',
-         'queue/nr_requests',
-         'queue/rq_affinity',
-         'queue/nomerges',
-         'queue/add_random',
-         'queue/rotational',
-         'queue/max_hw_sectors_kb',
-         'queue/physical_block_size',
-         'queue/optimal_io_size',
-        ].each do |entity|
-          path = "#{sd_dev}/#{entity}"
-          if File.exists?(path)
-            f.puts("## #{path}")
-            f.puts(`cat #{path}`)
+
+        dirs = []
+        Dir.glob(blockdev + "/*").each do |entry|
+          next if blacklists.any?{|r| r =~ entry}
+
+          st = File::Stat.new(entry)
+
+          if st.ftype == "file" && st.readable? && st.mode & 0444 > 0
+            f.puts("## #{entry}")
+            f.puts(`cat #{entry}`)
             f.puts("")
+          elsif st.ftype == "link" && st.readable? && st.mode & 0444 > 0
+            f.puts("## #{entry}")
+            f.puts(`ls -l #{entry}`)
+            f.puts("")
+          elsif st.ftype == "directory" && st.readable? && st.mode & 0444 > 0
+            dirs.push(entry)
+          end
+        end
+
+        while (dir = dirs.shift) != nil
+          Dir.glob(dir + "/*").each do |entry|
+            next if blacklists.any?{|r| r =~ entry}
+
+            st = File::Stat.new(entry)
+
+            if st.ftype == "file" && st.readable? && st.mode & 0444 > 0
+              f.puts("## #{entry}")
+              f.puts(`cat #{entry}`)
+              f.puts("")
+            elsif st.ftype == "link" && st.readable? && st.mode & 0444 > 0
+              f.puts("## #{entry}")
+              f.puts(`ls -l #{entry}`)
+              f.puts("")
+            elsif st.ftype == "directory" && st.readable? && st.mode & 0444 > 0
+              f.puts("## #{entry}")
+              f.puts(`ls -l #{entry}/`)
+              f.puts("")
+            end
+
+            if devname =~ /^nvme/
+              if entry =~ /device\/device$/
+                dirs.push(entry)
+              end
+            end
           end
         end
       end
@@ -480,6 +537,33 @@ EOS
     end
   end
 
+  def save_biosdecode_info()
+    biosdecode_bin = find_executable("biosdecode")
+
+    if biosdecode_bin
+      File.open("#{@output_dir}/biosdecode.log", "w") do |f|
+        content = `#{biosdecode_bin} 2>&1`
+        f.puts("## biosdecode")
+        f.puts(content)
+        f.puts("")
+      end
+    end
+  end
+
+  def save_nvme_info()
+    # https://github.com/linux-nvme/nvme-cli
+    nvme_bin = find_executable("nvme")
+
+    if nvme_bin
+      File.open("#{@output_dir}/nvme-cli-list.log", "w") do |f|
+        content = `#{nvme_bin} list 2>&1`
+        f.puts("## nvme list")
+        f.puts(content)
+        f.puts("")
+      end
+    end
+  end
+
   def save_megaraid_info(megacli_bin)
     File.open("#{@output_dir}/megaraid.log", "w") do |f|
       params_list = ["-AdpCount",

data/lib/perfmonger/command/plot.rb

@@ -28,6 +28,7 @@ EOS
     @disk_plot_read = true
     @disk_plot_write = true
     @disk_numkey_threshold = 10
+    @plot_iops_max = nil
   end
 
   def parse_args(argv)
@@ -80,25 +81,29 @@ EOS
       @disk_only_regex = Regexp.compile(regex)
     end
 
-    @parser.on('--disk-read-only', "Plot only READ performance for disks") do
+    @parser.on('--plot-read-only', "Plot only READ performance for disks") do
       @disk_plot_read = true
       @disk_plot_write = false
     end
 
-    @parser.on('--disk-write-only', "Plot only WRITE performance for disks") do
+    @parser.on('--plot-write-only', "Plot only WRITE performance for disks") do
       @disk_plot_read = false
       @disk_plot_write = true
     end
 
-    @parser.on('--disk-read-write', "Plot READ and WRITE performance for disks") do
+    @parser.on('--plot-read-write', "Plot READ and WRITE performance for disks") do
       @disk_plot_read = true
       @disk_plot_write = true
     end
 
-    @parser.on('--disk-numkey-threshold NUM', "Legends of per-disk plots are turned off if the number of disks is larger than this value.") do |num|
+    @parser.on('--plot-numkey-threshold NUM', "Legends of per-disk plots are turned off if the number of disks is larger than this value.") do |num|
       @disk_numkey_threshold = num.to_i
     end
 
+    @parser.on('--plot-iops-max IOPS', "Maximum of IOPS plot range (default: auto)") do |iops|
+      @plot_iops_max = iops.to_f
+    end
+
     @parser.parse!(argv)
 
     if argv.size == 0
@@ -250,8 +255,13 @@ EOS
         set_key_stmt = "set key below center"
       end
 
+      iops_yrange = "set yrange [0:*]"
+      if @plot_iops_max
+        iops_yrange = "set yrange [0:#{@plot_iops_max}]"
+      end
+
       gpfile.puts <<EOS
-set term pdfcairo enhanced color
+set term pdfcairo enhanced color size 6in,2.5in
 set title "IOPS"
 set size 1.0, 1.0
 set output "#{iops_pdf_filename}"
@@ -261,7 +271,7 @@ set ylabel "IOPS"
 
 set grid
 set xrange [#{@offset_time}:#{end_time - start_time}]
-set yrange [0:*]
+#{iops_yrange}
 
 #{set_key_stmt}
 plot #{iops_plot_stmt_list.join(",\\\n     ")}
@@ -275,6 +285,7 @@ plot #{total_iops_plot_stmt_list.join(",\\\n     ")}
 set title "Transfer rate"
 set output "#{transfer_pdf_filename}"
 set ylabel "transfer rate [MB/s]"
+set yrange [0:*]
 #{set_key_stmt}
 plot #{transfer_plot_stmt_list.join(",\\\n     ")}
 
@@ -349,7 +360,7 @@ EOS
 
       pdf_file = File.join(@output_dir, "cpu.pdf")
       gpfile.puts <<EOS
-set term pdfcairo enhanced color
+set term pdfcairo enhanced color size 6in,2.5in
 set title "CPU usage (max: #{nr_cpu*100}%)"
 set output "#{pdf_filename}"
 set key outside center bottom horizontal

data/lib/perfmonger/command/record.rb

@@ -79,13 +79,19 @@ EOS
     end
 
     # run perfmonger-recorder (normal path)
-    begin
-      if session_pid && Process.getpgid(session_pid)
-        $stderr.puts("[ERROR] another perfmonger is already running.")
-        return false
+
+    if @option.background
+      # If perfmonger is going to start in background mode,
+      # there must be an another session running.
+
+      begin
+        if session_pid && Process.getpgid(session_pid)
+          $stderr.puts("[ERROR] another perfmonger is already running in background mode")
+          return false
+        end
+      rescue Errno::ESRCH
+        # Actually there is no perfmonger running. go through.
       end
-    rescue Errno::ESRCH
-      # Actually there is no perfmonger running. go through.
     end
 
     exec_record_cmd()
@@ -102,6 +108,11 @@ private
     else
       $stdout.puts("[recording to #{@option.logfile}]")
     end
+
+    if ENV['PERFMONGER_DEBUG'] != nil && ! ENV['PERFMONGER_DEBUG'].empty?
+      $stderr.puts("[debug] cmd: " + cmd.join(" "))
+    end
+
     Process.exec(*cmd)
   end
 end

data/lib/perfmonger/command/record_option.rb

@@ -60,13 +60,26 @@ class RecordOption
     if @no_disk
       cmd << "-no-disk"
     end
+    if @no_intr
+      cmd << "-no-intr"
+    end
     if @devices.size > 0
       cmd << "-disks"
       cmd << @devices.join(",")
     end
+    if @background
+      cmd << "-background"
+    end
 
     # TODO: implement device filter
 
+    if ! @logfile_set && @gzip
+      @logfile += ".gz"
+    end
+    if @gzip
+      cmd << "-gzip"
+    end
+
     cmd << "-output"
     cmd << @logfile
 
@@ -84,8 +97,11 @@ class RecordOption
     @verbose           = false
     @no_cpu            = false
     @no_disk           = false
+    @no_intr           = true
     @devices           = []
     @logfile           = "perfmonger.pgr"
+    @logfile_set       = false
+    @gzip              = true
     @background            = false
     @kill              = false
 
@@ -97,6 +113,10 @@ class RecordOption
       @no_disk = false
     end
 
+    @parser.on('--record-intr', 'Record per core interrupts count (experimental)') do
+      @no_intr = false
+    end
+
     @parser.on('-i', '--interval SEC',
                'Amount of time between each measurement report. Floating point is o.k.') do |interval|
       @interval = Float(interval)
@@ -123,6 +143,11 @@ class RecordOption
 
     @parser.on('-l', '--logfile FILE') do |file|
       @logfile = file
+      @logfile_set = true
+    end
+
+    @parser.on('--no-gzip', 'Do not Save a logfile in gzipped format') do
+      @gzip = false
     end
 
     @parser.on('--background', 'Run in background') do

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.9.0"
+  VERSION = "0.10.1"
 end

data/spec/data/busy100.pgr.played

@@ -0,0 +1,3 @@
+{"time":1425358686.123,"cpu":{"num_core":2,"all":{"usr":100.00,"nice":0.00,"sys":0.67,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":99.67,"nice":0.00,"sys":0.33,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":3.33,"rkbyteps":0.00,"wkbyteps":53.31,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00}}}
+{"time":1425358689.123,"cpu":{"num_core":2,"all":{"usr":100.50,"nice":0.00,"sys":0.33,"idle":99.17,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}
+{"time":1425358690.645,"cpu":{"num_core":2,"all":{"usr":100.65,"nice":0.00,"sys":0.00,"idle":99.35,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.65,"nice":0.00,"sys":0.65,"idle":98.70,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}

data/spec/data/busy100.pgr.plot-formatted.cpu.dat

@@ -0,0 +1,21 @@
+# All cpu usage
+# elapsed_time	%usr	%nice	%sys	%iowait	%hardirq	%softirq	%steal	%guest	%idle
+0.000000	100.000000	0.000000	0.666667	0.000000	0.000000	0.000000	0.000000	0.000000	99.333333
+3.001173	100.500835	0.000000	0.333890	0.000000	0.000000	0.000000	0.000000	0.000000	99.165275
+6.001157	100.653595	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	99.346405
+
+
+
+# core: 0
+# elapsed_time	%usr	%nice	%sys	%iowait	%hardirq	%softirq	%steal	%guest	%idle
+0.000000	0.334448	0.000000	0.334448	0.000000	0.000000	0.000000	0.000000	0.000000	99.331104
+3.001173	0.333333	0.000000	0.333333	0.000000	0.000000	0.000000	0.000000	0.000000	99.333333
+6.001157	0.649351	0.000000	0.649351	0.000000	0.000000	0.000000	0.000000	0.000000	98.701299
+
+
+
+# core: 1
+# elapsed_time	%usr	%nice	%sys	%iowait	%hardirq	%softirq	%steal	%guest	%idle
+0.000000	99.666667	0.000000	0.333333	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+3.001173	100.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+6.001157	100.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000

data/spec/data/busy100.pgr.plot-formatted.disk.dat

@@ -0,0 +1,32 @@
+
+
+
+# device: sda
+# elapsed_time	r_iops	w_iops	r_MB/s	w_MB/s	r_latency	w_latency	r_avgsz	w_avgsz	qdepth
+0.000000	0.000000	1.666015	0.000000	0.026031	0.000000	0.000000	0.000000	32.000000	0.000000
+3.001173	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+6.001157	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+
+
+
+# device: sda1
+# elapsed_time	r_iops	w_iops	r_MB/s	w_MB/s	r_latency	w_latency	r_avgsz	w_avgsz	qdepth
+0.000000	0.000000	1.666015	0.000000	0.026031	0.000000	0.000000	0.000000	32.000000	0.000000
+3.001173	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+6.001157	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+
+
+
+# device: sda2
+# elapsed_time	r_iops	w_iops	r_MB/s	w_MB/s	r_latency	w_latency	r_avgsz	w_avgsz	qdepth
+0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+3.001173	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+6.001157	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+
+
+
+# device: total
+# elapsed_time	r_iops	w_iops	r_MB/s	w_MB/s	r_latency	w_latency	r_avgsz	w_avgsz	qdepth
+0.000000	0.000000	3.332030	0.000000	0.052063	0.000000	0.000000	0.000000	32.000000	0.000000
+3.001173	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000
+6.001157	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000

data/spec/data/busy100.pgr.summary

@@ -0,0 +1,55 @@
+== performance summary of 'spec/data/busy100.pgr' ==
+
+Duration: 7.524 sec
+
+* Average CPU usage (MAX: 200 %)
+  * Non-idle usage: 100.73 %
+       %usr: 100.33 %
+       %sys: 0.40 %
+       %irq: 0.00 %
+      %soft: 0.00 %
+     %other: 0.00 %
+  * Idle usage: 99.27 %
+    %iowait: 0.00 %
+      %idle: 99.27 %
+
+* Average DEVICE usage: sda
+        read IOPS: 0.00
+       write IOPS: 0.66
+  read throughput: 0.00 MB/s
+ write throughput: 0.01 MB/s
+     read latency: 0.0 usec
+    write latency: 0.0 usec
+      read amount: 0.00 MB
+     write amount: 0.08 MB
+
+* Average DEVICE usage: sda1
+        read IOPS: 0.00
+       write IOPS: 0.66
+  read throughput: 0.00 MB/s
+ write throughput: 0.01 MB/s
+     read latency: 0.0 usec
+    write latency: 0.0 usec
+      read amount: 0.00 MB
+     write amount: 0.08 MB
+
+* Average DEVICE usage: sda2
+        read IOPS: 0.00
+       write IOPS: 0.00
+  read throughput: 0.00 MB/s
+ write throughput: 0.00 MB/s
+     read latency: 0.0 usec
+    write latency: 0.0 usec
+      read amount: 0.00 MB
+     write amount: 0.00 MB
+
+* Average DEVICE usage: total
+        read IOPS: 0.00
+       write IOPS: 1.33
+  read throughput: 0.00 MB/s
+ write throughput: 0.02 MB/s
+     read latency: 0.0 usec
+    write latency: 0.0 usec
+      read amount: 0.00 MB
+     write amount: 0.16 MB
+