presto-metrics 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76738b2193dac8ff0c1b85ab37c8d3773e7c1540
-  data.tar.gz: 024bef2488910dca9483240bc6fca29fe9d24c8d
+  metadata.gz: 9617d545ab8d02a5d52eba1a50a2623f20ae4e55
+  data.tar.gz: 7e5af26f44fd021a19b69e18cc3a8d3f1dad90c7
 SHA512:
-  metadata.gz: 24cd82ee453475715789b9469458514d380b6f6027c9db7e912a60b18e0cb24b63df74da2700e85db2abfe08f73229bc10627ff35a2dd00913ec1d76e15fbaaf
-  data.tar.gz: 1deb4275a340a4162bf0a9111b6723acb1cfe949c179631b34f79bde31d8fa3df63863f88bd70d2524f73f6d879685636935738676f48454de0a5a3ed627dd31
+  metadata.gz: dc12934048e4a46f4c2f29611cbae251462b2db930e99993c454fd9edceb8ec111152ffcb73dc7cbfc508d1d15c7813eb2702780a95730e151c69a8385b142d8
+  data.tar.gz: 1cdcf563633f9a6883f11f21dd97809face44c54adf6058ea052dc41a47ea5296e91a6962bfacd6a3f5e43fd3630c6ff37cbcfd537e6b6f74d985b69dd87d4de

data/lib/presto/metrics/client.rb

@@ -30,9 +30,11 @@ module Presto
           'task_manager' => 'com.facebook.presto.execution:name=TaskManager',
           'memory_pool_general' => 'com.facebook.presto.memory:type=MemoryPool,name=general',
           'memory_pool_reserved' => 'com.facebook.presto.memory:type=MemoryPool,name=reserved',
+          'memory_pool_system' => 'com.facebook.presto.memory:type=MemoryPool,name=system',
           'cluster_memory_manager' => 'com.facebook.presto.memory:name=ClusterMemoryManager',
           'cluster_memory_pool_general' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=general',
           'cluster_memory_pool_reserved' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=reserved',
+          'cluster_memory_pool_system' => 'com.facebook.presto.memory:type=ClusterMemoryPool,name=system',
       }
 
       def path(path)
@@ -215,13 +217,13 @@ module Presto
       end
 
       def memory_pool_metrics(target_attr=[])
-        ['general', 'reserved'].each_with_object({}) {|type, hash|
+        ['general', 'reserved', 'system'].each_with_object({}) {|type, hash|
           hash[type] = get_metrics("com.facebook.presto.memory:type=MemoryPool,name=#{type}", target_attr)
         }
       end
 
       def cluster_memory_pool_metrics(target_attr=[])
-        ['general', 'reserved'].each_with_object({}) {|type, hash|
+        ['general', 'reserved', 'system'].each_with_object({}) {|type, hash|
           hash[type] = get_metrics("com.facebook.presto.memory:type=ClusterMemoryPool,name=#{type}", target_attr)
         }
       end

data/lib/presto/metrics/query.rb

@@ -67,7 +67,11 @@ module Presto
       end
 
       def find(queryId)
-        JSON.parse(@client.get_query_json(queryId, "{}"))
+        begin
+          JSON.parse(@client.get_query_json(queryId, "{}"))
+        rescue
+          {}
+        end
       end
 
       def task_list(queryId)
@@ -93,7 +97,11 @@ module Presto
       end
 
       def query_list(path="")
-        JSON.parse(@client.get_query_json(path))
+        begin
+          JSON.parse(@client.get_query_json(path))
+        rescue
+          []
+        end
       end
 
       def running_list
@@ -118,8 +126,7 @@ module Presto
       def query_progress
         running_queries = query_list.map { |q| QueryInfo.decode(q) }.select { |q| q.state == :running }
         query_info = running_queries.map { |q|
-          queryInfo = find(q.query_id)
-          QueryInfo.decode(queryInfo)
+          QueryInfo.decode(find(q.query_id))
         }
 
         result = {}

data/lib/presto/metrics/version.rb

@@ -1,5 +1,5 @@
 module Presto
   module Metrics
-    VERSION = '0.3.10'
+    VERSION = '0.3.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Taro L. Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler