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

fix JRuby resolv.rb leak (#10741)

Browse source
This commit is contained in:
Colin Surprenant 2019-05-07 16:08:35 -04:00 • committed by GitHub
parent 1c64619ac0
commit a0d05b4da7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2937 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
logstash-core/lib/logstash/patches/resolv.rb
View file

@ -1,19 +1,25 @@
require "resolv"
# ref: https://github.com/logstash-plugins/logstash-filter-dns/issues/40
# ref:
# https://github.com/logstash-plugins/logstash-filter-dns/issues/51
# https://github.com/jruby/jruby/pull/5722
#
# JRuby 9k versions prior to 9.1.16.0 have a bug which crashes IP address
# resolution after 64k unique IP addresses resolutions.
# JRuby versions starting at 9.2.0.0 have a bug in resolv.rb with a leak between the
# DNS.allocate_request_id/DNS.free_request_id methods.
#
# Note that the oldest JRuby version in LS 6 is 9.1.13.0 and
# JRuby 1.7.25 and 1.7.27 (the 2 versions used across LS 5) are not affected by this bug.
# We are opting to load a patched full resolv.rb instead of monkey patching the
# offending methods because we do not yet know in which upcoming version of JRuby
# this will be fixed and we want to avoid potential conflicting monkey patches.
# A spec which will break on JRuby upgrade will redirect here
# to make a manual verification and eventually remove that patch here once the fix is
# made in the JRuby version of resolv.rb.
# make sure we abort if a known correct JRuby version is installed
# to avoid having an unnecessary legacy patch being applied in the future.
if Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new("9.2.0.0")
# save verbose level and mute the "warning: already initialized constant"
warn_level = $VERBOSE
$VERBOSE = nil
# The code below is copied from JRuby 9.1.16.0 resolv.rb:
# https://github.com/jruby/jruby/blob/9.1.16.0/lib/ruby/stdlib/resolv.rb#L775-L784
#
# JRuby is Copyright (c) 2007-2017 The JRuby project, and is released
# under a tri EPL/GPL/LGPL license.
# Full license available at https://github.com/jruby/jruby/blob/9.1.16.0/COPYING
require_relative "resolv_9270"
$VERBOSE = warn_level
end

2903
logstash-core/lib/logstash/patches/resolv_9270.rb Normal file
View file

File diff suppressed because it is too large Load diff

15
logstash-core/spec/logstash/jruby_version_spec.rb Normal file
View file

@ -0,0 +1,15 @@
require 'spec_helper'
describe "JRuby Version" do
it "should break on JRuby version change" do
# This spec will break upon JRuby version change to make sure we
# verify if resolv.rb has been fixed in Jruby so we can get rid of
# lib/logstash/patches/resolv.rb.
# ref:
# https://github.com/logstash-plugins/logstash-filter-dns/issues/51
# https://github.com/jruby/jruby/pull/5722
expect(JRUBY_VERSION).to eq("9.2.7.0")
end
end