server_metrics 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+* Grouping kthreadd's children together under the comm "kthreadd"
+
 ## 0.1.0
 
 * Optimization for collecting processes on Linux

data/lib/server_metrics/collectors/processes.rb

@@ -47,17 +47,7 @@ class ServerMetrics::Processes
 
   def run
     @processes = calculate_processes # returns a hash
-    top_memory = get_top_processes(:memory, 10) # returns an array
-    top_cpu = get_top_processes(:cpu, 10) # returns an array
-
-    # combine the two and index by cmd. The indexing process will remove duplicates
-    result = (top_cpu + top_memory).inject(Hash.new) {|temp_hash,process_hash| temp_hash[process_hash[:cmd]] = process_hash; temp_hash }
-
-    # An alternate approach is to return an array with two separate arrays. More explicit, but more verbose.
-    #{
-    #    :top_memory => get_top_processes(:memory, 10),
-    #    :top_cpu => get_top_processes(:cpu, 10)
-    #}
+    @processes.keys.inject(@processes) { |processes, key| processes[key][:cmd] = key; processes }
   end
 
   # called from run(). This method lists all the processes running on the server, groups them by command,
@@ -121,13 +111,6 @@ class ServerMetrics::Processes
     grouped
   end
 
-  # Can only be called after @processes is set. Based on @processes, calcuates the top {num} processes, as ordered by {order_by}.
-  # Returns an array of hashes:
-  # [{:cmd=>"ruby", :cpu=>30.0, :memory=>100, :uid=>1,:cmdlines=>[]}, {:cmd => ...} ]
-  def get_top_processes(order_by, num)
-    @processes.map { |key, hash| {:cmd => key}.merge(hash) }.sort { |a, b| a[order_by] <=> b[order_by] }.reverse[0...num]
-  end
-
   # Relies on the /proc directory (/proc/timer_list). We need this because the process CPU utilization is measured in jiffies.
   # In order to calculate the process' % usage of total CPU resources, we need to know how many jiffies have passed.
   # Unfortunately, jiffies isn't a fixed value (it can vary between 100 and 250 per second), so we need to calculate it ourselves.

data/lib/server_metrics/lib/proctable_lite.rb

@@ -20,6 +20,21 @@ module SysLite
 
     # @mem_total = IO.read("/proc/meminfo")[/MemTotal.*/].split[1].to_i * 1024 rescue nil
     # @boot_time = IO.read("/proc/stat")[/btime.*/].split.last.to_i rescue nil
+    
+    # Handles a special case on Ubuntu - kthreadd generates many children (200+). 
+    # These are aggregated together and reported as a single process, kthreadd.
+    #  
+    # Examples child process names:
+    #
+    # watchdog/5  
+    # kworker/10:1 
+    # kworker/10:1H
+    # ksoftirqd/8 
+    # migration/10 
+    # scsi_eh_2 
+    # flush-9:2 
+    # kswapd0
+    @kthreadd = nil # the ProcTableStruct representing kthreadd
 
     @fields = [
         'cmdline',     # Complete command line
@@ -107,7 +122,6 @@ module SysLite
     def self.ps(pid=nil)
       array  = block_given? ? nil : []
       struct = nil
-
       raise TypeError unless pid.is_a?(Fixnum) if pid
 
       Dir.foreach("/proc"){ |file|
@@ -172,9 +186,10 @@ module SysLite
         stat = stat.split
 
         struct.pid         = stat[0].to_i
-        struct.comm        = stat[1].tr('()','') # Remove parens
+        # Remove parens. Note this could be overwritten in #get_comm_group_name.
+        struct.comm        = stat[1].tr('()','')
         # struct.state       = stat[2]
-        #        struct.ppid        = stat[3].to_i
+        struct.ppid        = stat[3].to_i
         #        struct.pgrp        = stat[4].to_i
         #        struct.session     = stat[5].to_i
         #        struct.tty_nr      = stat[6].to_i
@@ -233,7 +248,18 @@ module SysLite
         # Manually calculate CPU and memory usage
         # struct.pctcpu = get_pctcpu(struct.utime, struct.starttime)
         # struct.pctmem = get_pctmem(struct.rss)
-
+        
+        # don't report kthreadd chidren individually - aggregate into the parent.
+        if kthreadd_child?(struct.ppid)
+          @kthreadd.utime += struct.utime
+          @kthreadd.stime += struct.stime
+          @kthreadd.rss += struct.rss
+          next
+        elsif struct.comm == 'kthreadd'
+          @kthreadd = struct
+          next
+        end
+        
         struct.freeze # This is read-only data
 
         if block_given?
@@ -243,7 +269,12 @@ module SysLite
         end
       }
 
-      pid ? struct : array
+      if pid
+        struct
+      else 
+        array << @kthreadd if @kthreadd # not added when iterating.
+        array
+      end
     end
 
     # Returns an array of fields that each ProcTableStruct will contain. This
@@ -261,6 +292,11 @@ module SysLite
     end
 
     private
+    
+    # True if the process's parent process id is kthreadd.
+    def self.kthreadd_child?(ppid)
+      @kthreadd and @kthreadd.pid == ppid
+    end
 
     # Calculate the percentage of memory usage for the given process.
     #

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/test_basics.rb

@@ -84,7 +84,7 @@ class TestBasics < Test::Unit::TestCase
     p.instance_variable_set '@last_run', last_run
     p.instance_variable_set '@last_process_list', "bogus value"
 
-    assert_equal({:last_run=>last_run,:last_jiffies=>nil,:last_process_list=>"bogus value"}, p.to_hash)
+    assert_equal({ :last_run => last_run, :last_jiffies => nil, :last_process_list => "bogus value" }, p.to_hash)
   end
 
   def test_processes_from_hash
@@ -151,4 +151,4 @@ class TestBasics < Test::Unit::TestCase
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable