VSB-TUO/Make Solr heap tunable via SOLR_HEAP (backport #1309)#1332
Merged
Conversation
Backport of #1309 to customer/vsb-tuo. Translate (not cherry-pick) the single Solr heap line against this branch's actual compose file: it launches Solr with -p ${SOLR_PORT}, so only the -m 4g argument is changed to -m "${SOLR_HEAP:-4g}". With SOLR_HEAP unset the 4g default is preserved; AlwaysPreTouch no longer forces the full 4g commit when a smaller heap is set. Refs dataquest-dev/dspace-customers#746 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The Solr heap in
docker/docker-compose-rest.ymlis hardcoded to-m 4g. With-XX:+AlwaysPreTouchthe container commits the full 4 GB on start — wasteful on shared devhosts running several DSpace stacks, and not lowerable without editing a tracked file.
Backport of #1309 to
customer/vsb-tuo.Tracking issue: dataquest-dev/dspace-customers#746
Change set
Single-line change to the
dspacesolrentrypoint indocker/docker-compose-rest.yml:Translated, not cherry-picked (per the FE backport model). On this branch (7.6.5 family) the Solr launch uses
-p ${SOLR_PORT},so only the
-m 4gargument changed; the port and every other line are untouched. The valueis quoted to survive word-splitting, matching the source PR follow-up.
Out of scope: the default heap value (stays
4g), other services, ports, Solr image/version,and
AlwaysPreTouch.Test evidence
-m "${SOLR_HEAP:-4g}"-m 4gno longer present (grep count 0)yaml.safe_load); edit sits inside the entrypoint scalarSOLR_HEAPunset -> 4g,SOLR_HEAP=1g-> 1g