Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reintroduce bundler 2.4 #14995

Merged
merged 3 commits into from Apr 12, 2023
Merged

Reintroduce bundler 2.4 #14995

merged 3 commits into from Apr 12, 2023

Conversation

jsvd
Copy link
Member

@jsvd jsvd commented Apr 11, 2023

  1. reintroduce bundler 2.4 and remove tweaks for 2.3
  2. avoid memory leak during generatePluginsVersion
  3. skip logstash-input-cloudwatch to avoid bundler 2.4 struggling with dependency resolution

…luginsVersion

for some reason, instances of Bundler::Dsl are retained in
org.jruby.MetaClass. Each Bundler::Dsl will retain Bundler::SourceList
which is > 150MB. This commit sets the internal state of each Dsl's
source list so the large objects can be collected.

The proper fix would be to either reuse a single Dsl object or fix the
code upstream to avoid having Dsl objects retained by org.jruby.MetaClass.
the new bundler 2.4's resolution algorithm seems to struggle in certain
situations, like resolving combination of "logstash-input-cloudwatch" and
"logstash-integration-aws".

Until the issue is solved let's skip it.
@jsvd jsvd changed the title Reintroduce bundler 2 4 Reintroduce bundler 2.4 Apr 11, 2023
@andsel andsel self-requested a review April 11, 2023 12:13
Copy link
Contributor

@andsel andsel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Tested locally resulted in

Successfully installed: logstash-input-elastic_serverless_forwarder
Successful: 185/207
Failures: 19/207
Execution of label: batch install of plugins, 2094.376126s
Generating: /path/to/logstash/plugins_version_docs.json

Checking if 🔴 CI is consistent or not, however shouldn't be related to this change

@jsvd
Copy link
Member Author

jsvd commented Apr 11, 2023

jenkins test this please

@jsvd jsvd merged commit 0df07d3 into elastic:main Apr 12, 2023
3 checks passed
@jsvd jsvd deleted the reintroduce_bundler_2_4 branch April 12, 2023 09:11
jsvd added a commit to jsvd/logstash that referenced this pull request May 25, 2023
jsvd added a commit that referenced this pull request Jun 2, 2023
jsvd added a commit that referenced this pull request Jun 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants