hadoop-metrics 0.1.4 → 0.1.5

data/lib/hadoop_metrics/api.rb

@@ -24,7 +24,7 @@ module HadoopMetrics
 
     def gc
       disable_snake_case {
-        result = via_jmx('java.lang:type=GarbageCollector,name=*').map { |jmx_gc_info|
+        result = query_jmx('java.lang:type=GarbageCollector,name=*').map { |jmx_gc_info|
           return nil if jmx_gc_info['LastGcInfo'].nil?
 
           gc_info = {'type' => (/PS Scavenge/.match(jmx_gc_info['name']) ? 'minor' : 'major')}
@@ -37,8 +37,35 @@ module HadoopMetrics
       }
     end
 
-    def via_jmx(query, json_fields = [])
-      HadoopMetrics.get_response(URI("http://#{@endpoint}/jmx?qry=#{query}"))['beans'].map { |jmx_json|
+    MegaByte = 1024.0 * 1024
+
+    def memory
+      disable_snake_case {
+        result = {}
+
+        memory = query_jmx('java.lang:type=Memory').first
+        heap, non_heap = memory['HeapMemoryUsage'], memory['NonHeapMemoryUsage']
+        result['committed'] = (heap['committed'] + non_heap['committed']) / MegaByte
+        result['used'] = (heap['used'] + non_heap['used']) / MegaByte
+        result['max'] = (heap['max'] + non_heap['max']) / MegaByte
+
+        arguments = get_jmx('java.lang:type=Runtime::InputArguments').first['InputArguments']
+        result['mx_option'] = arguments.select { |arg| arg =~ /-Xmx(.*)m/ }.last["-Xmx".size..-2].to_i
+
+        result
+      }
+    end
+
+    def query_jmx(query, json_fields = [])
+      via_jmx('qry', query, json_fields)
+    end
+
+    def get_jmx(query, json_fields = [])
+      via_jmx('get', query, json_fields)
+    end
+
+    def via_jmx(type, query, json_fields = [])
+      HadoopMetrics.get_response(URI("http://#{@endpoint}/jmx?#{type}=#{query}"))['beans'].map { |jmx_json|
         json_fields.each { |f|
           jmx_json[f] = JSON.parse(jmx_json[f])
         }

data/lib/hadoop_metrics/job_tracker.rb

@@ -7,7 +7,7 @@ module HadoopMetrics
     JSON_FILED_VALUES = %W(SummaryJson AliveNodesInfoJson BlacklistedNodesInfoJson QueueInfoJson)
 
     def info
-      via_jmx('hadoop:service=JobTracker,name=JobTrackerInfo', JSON_FILED_VALUES).first
+      query_jmx('hadoop:service=JobTracker,name=JobTrackerInfo', JSON_FILED_VALUES).first
     end
 
     def mapred(opts = {})

data/lib/hadoop_metrics/name_node.rb

@@ -7,11 +7,11 @@ module HadoopMetrics
     JSON_FILED_VALUES = %W(LiveNodes DeadNodes DecomNodes NameDirStatuses)
 
     def info
-      via_jmx('Hadoop:service=NameNode,name=NameNodeInfo', JSON_FILED_VALUES).first
+      query_jmx('Hadoop:service=NameNode,name=NameNodeInfo', JSON_FILED_VALUES).first
     end
 
     def dfs
-      via_jmx('Hadoop:service=NameNode,name=FSNamesystem').first
+      query_jmx('Hadoop:service=NameNode,name=FSNamesystem').first
     end
   end
 end

data/lib/hadoop_metrics/task_tracker.rb

@@ -7,7 +7,7 @@ module HadoopMetrics
     JSON_FILED_VALUES = %W(TasksInfoJson)
 
     def info
-      via_jmx('hadoop:service=TaskTracker,name=TaskTrackerInfo', JSON_FILED_VALUES).first
+      query_jmx('hadoop:service=TaskTracker,name=TaskTrackerInfo', JSON_FILED_VALUES).first
     end
 
     def shuffle_output(opts = {})

data/lib/hadoop_metrics/version.rb

@@ -1,3 +1,3 @@
 module HadoopMetrics
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hadoop-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1459145932997394850
+      hash: 729197856431760282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1459145932997394850
+      hash: 729197856431760282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23