diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-11-04 15:35:45 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-11-04 15:35:45 +0000 |
| commit | fc341ed6e87b324a55719b2145f6fd6576067477 (patch) | |
| tree | e15865753e3db7b07f488fff8762f175dadcac13 | |
| parent | 7dac6eb80aeaf18ec95dc87a7ac0ff8ee68493cd (diff) | |
| parent | c50e30c4cb0c50802a5bfb1afc7a81da8cc478b9 (diff) | |
| download | bundler-fc341ed6e87b324a55719b2145f6fd6576067477.tar.gz | |
Auto merge of #6145 - halfbyte:reduce_dependency_trees_bailout, r=segiddins
Bail out of reducing depency trees on huge dependency conflict sets
### What was the end-user problem that led to this PR?
The problem is described in #6114 - An unusually large set of conflicting dependencies leads to bundler get stuck and lead to very unhealthy amounts of memory and CPU time be consumed.
### What was your diagnosis of the problem?
This happens because because a too large array is fed into Array#combination in the "reduce_trees" lambda in `version_conflict_message`.
### What is your fix for the problem, implemented in this PR?
By simply bailing out when the conflict set is bigger than a certain size,
we'll get a result that is similar to what happened in earlier bundler versions
but skip a ton of CPU cycles and memory allocations.
I've chosen the limit rather unscientifically by playing around with the result
set sizes. 15 seems to be a good compromise but really anything larger than 10
should work (and with work I mean "should not usually not have to be invoked").
### Why did you choose this fix out of the possible options?
Reducing the conflict trees has been a rather new addition to bundler, so defaulting back to the old behavior of not reducing the trees seems like an OK option. It may be possible to also optimize the reduction algorithm, but since this is very much an edge case that only happens when using Bundler slightly out of the normal procedures, I think a simple bail out is sufficient.
| -rw-r--r-- | lib/bundler/resolver.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index f75c669534..8a3afa3418 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -309,6 +309,8 @@ module Bundler :solver_name => "Bundler", :possibility_type => "gem", :reduce_trees => lambda do |trees| + # bail out if tree size is too big for Array#combination to make any sense + return trees if trees.size > 15 maximal = 1.upto(trees.size).map do |size| trees.map(&:last).flatten(1).combination(size).to_a end.flatten(1).select do |deps| |