SOLR-16781: Disable <lib/> by default on 9.x #2894
Merged
Conversation
This file contains 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
`<lib/>` usage will now log a warning by default for future 9.x releases. Wary users can re-enabled the feature by specifying a sysprop: `solr.config.lib.enabled=true`. This commit is intended only for branch_9x (i.e. NOT main)
| @@ -620,10 +620,15 @@ protected Map<String, Object> startSolr( | |||
| if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath)) | |||
| solrHome = solrHome.substring(cwdPath.length() + 1); | |||
|
|
|||
| final var syspropArg = | |||
There was a problem hiding this comment.
If you are adding this, should the lib directive be removed from the example configSet?
There was a problem hiding this comment.
It's already gone, afaict. @epugh removed it (unrelated to this change) in a recent PR here
| @@ -70,6 +72,7 @@ public static void beforeClass() { | |||
| Paths.get(".").toAbsolutePath().toString().contains(" ")); | |||
| // to be true | |||
| System.setProperty("solr.directoryFactory", "solr.NRTCachingDirectoryFactory"); | |||
| System.setProperty(LIB_ENABLED_SYSPROP, "true"); | |||
There was a problem hiding this comment.
If we remove the lib directives in the example ConfigSet, these should be able to be removed, right?
There was a problem hiding this comment.
Good catch, fixed!
7 tasks
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.
https://issues.apache.org/jira/browse/SOLR-16781
Description
<lib/>usage will now log a warning by default for future 9.x releases. Wary users can re-enabled the feature by specifying a sysprop:solr.config.lib.enabled=true.This PR is a companion to #2875, which makes more aggressive changes (removing
<lib>altogether) on the 'main' branch. As such, this PR is only intended for branch_9x, and #2875 is only intended for 'main'.Tests
New test in
TestConfigWithLibDisabledChecklist
Please review the following and check all that apply:
./gradlew check.