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.

Sign up for GitHub

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

Jump to bottom

Unpin bundler to allow 2.4 #14894

Merged
merged 3 commits into from
Feb 22, 2023
Merged

Unpin bundler to allow 2.4 #14894

merged 3 commits into from
Feb 22, 2023

Conversation

jsvd
Copy link
Member

@jsvd jsvd commented Feb 12, 2023 •
edited

replaces #14882

@jsvd jsvd marked this pull request as ready for review February 22, 2023 16:29
@jsvd jsvd requested a review from andsel February 22, 2023 16:29
andsel
andsel approved these changes Feb 22, 2023
View reviewed changes
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.

Despite the 🔴 CI LGTM

@jsvd jsvd merged commit 6d08a7c into main Feb 22, 2023
@jsvd jsvd deleted the unpin_bundler_2_3_18 branch February 22, 2023 17:05
jsvd added a commit to jsvd/logstash that referenced this pull request Mar 2, 2023
@jsvd
Revert "Unpin bundler to allow 2.4 (elastic#14894)"
2488427 
This reverts commit 6d08a7c.

Bundler 2.4 is accumulating memory during the `generateDocsVersion` task
outside of the known Bundler 2.3 DepProxy class.
Until the memory mitigation patch is adapted to Bundler 2.4 it's best to revert 6d08a7c.
@jsvd jsvd mentioned this pull request Mar 2, 2023
Merged
@andsel andsel mentioned this pull request Mar 6, 2023
Closed
jsvd added a commit that referenced this pull request Mar 23, 2023
@jsvd
Revert "Unpin bundler to allow 2.4 (#14894)" (#14942)
5e3038a 
This reverts commit 6d08a7c.

Bundler 2.4 is accumulating memory during the `generateDocsVersion` task
outside of the known Bundler 2.3 DepProxy class.
Until the memory mitigation patch is adapted to Bundler 2.4 it's best to revert 6d08a7c.
jsvd added a commit to jsvd/logstash that referenced this pull request Apr 11, 2023
@jsvd
Revert "Revert "Unpin bundler to allow 2.4 (elastic#14894)" (elastic#…
296a185 
…14942)"

This reverts commit 5e3038a.
jsvd added a commit that referenced this pull request Apr 12, 2023
@jsvd
Reintroduce bundler 2.4 (#14995)
0df07d3 
* Revert "Revert "Unpin bundler to allow 2.4 (#14894)" (#14942)"

This reverts commit 5e3038a.

* prevent bundler 2.4 from blowing up memory during ./gradlew generatePluginsVersion

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.

* skip input cloudwatch during generatePluginsVersion

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andsel andsel andsel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jsvd @andsel @roaksoax