github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix the heap collecting values

Browse source 
This PR fixes an issue where the max heap size was reported as the double of
the actual value because it was merging the values of the usage.max and
peak.max into a single value.

Fixes: #6608

Fixes #6827
This commit is contained in:
Pier-Hugues Pellerin 2017-03-21 16:35:58 -04:00 • committed by Suyog Rao
parent a552214fa1
commit 68151c894a
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
logstash-core/lib/logstash/instrument/periodic_poller/jvm.rb
View file

@ -161,14 +161,21 @@ module LogStash module Instrument module PeriodicPoller
end
def aggregate_information_for(collection)
transpose_map = {
"usage.used" => :used_in_bytes,
"usage.committed" => :committed_in_bytes,
"usage.max" => :max_in_bytes,
"peak.max" => :peak_max_in_bytes,
"peak.used" => :peak_used_in_bytes
}
collection.reduce(default_information_accumulator) do |m,e|
e = { e[0] => e[1] } if e.is_a?(Array)
e.each_pair do |k,v|
m[:used_in_bytes] += v if k.include?("used")
m[:committed_in_bytes] += v if k.include?("committed")
m[:max_in_bytes] += v if k.include?("max")
m[:peak_max_in_bytes] += v if k.include?("peak.max")
m[:peak_used_in_bytes] += v if k.include?("peak.used")
if transpose_map.include?(k)
transpose_key = transpose_map[k]
m[transpose_key] += v
end
end
m
end