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 an OOM issue when generating the plugins dependence json

Browse source 
Make sure the unused variables are freed in the recursive method call.

Fixes #7544
This commit is contained in:
Pier-Hugues Pellerin 2017-06-26 17:06:39 -04:00
parent ef8ec6a42c
commit 461d2058a9
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rakelib/plugins_docs_dependencies.rake
View file

@ -111,17 +111,24 @@ class PluginVersionWorking
end
end
def install(plugins_to_install, successful_dependencies, failures)
begin
def resolve_plugins(plugins_to_install)
builder = Bundler::Dsl.new
gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
plugins_to_install.each { |plugin_name| gemfile.update(plugin_name) }
builder.eval_gemfile("bundler file", gemfile.generate())
definition = builder.to_definition(LogStash::Environment::LOCKFILE, {})
definition.resolve_remotely!
definition
end
def install(plugins_to_install, successful_dependencies, failures)
begin
definition = resolve_plugins(plugins_to_install)
extract_versions(definition, successful_dependencies, :missing)
puts "Batch install size: #{plugins_to_install.size}, Succesfully resolved: #{plugins_to_install}"
rescue => e
definition = nil # mark it to GC
if plugins_to_install.size > 1
batch_install(plugins_to_install, successful_dependencies, failures)
else