SOLR-18062: Support arbitrary Kafka properties via env and sysprops#4185
Open
openworld-maker wants to merge 1 commit intoapache:mainfrom
Open
SOLR-18062: Support arbitrary Kafka properties via env and sysprops#4185openworld-maker wants to merge 1 commit intoapache:mainfrom
openworld-maker wants to merge 1 commit intoapache:mainfrom
Conversation
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.
Description
This PR completes SOLR-18062 by hardening and clarifying CrossDC Kafka pass-through property behavior.
Jira: https://issues.apache.org/jira/browse/SOLR-18062
mainalready included the core SOLR-18062 support for arbitrary Kafka properties via:SOLR_CROSSDC_KAFKA_*environment variablessolr.crossdc.kafka.*system propertiesThis change focuses on missing edge-case handling, precedence clarity, and testability.
What Changed
1) Hardened pass-through extraction in
ConfUtiladdAdditionalKafkaProperties(Map<String,Object> properties, Map<String,String> env, Properties sysProps)properties.solr.crossdc.kafka.*system properties overrideSOLR_CROSSDC_KAFKA_*env values for the same normalized Kafka key.2) Added focused unit coverage in
ConfUtilTestSOLR_CROSSDC_KAFKA_FOO_BAR->foo.bar)solr.crossdc.kafka.foo.bar->foo.bar)KafkaCrossDcConf.getAdditionalProperties()3) Updated CrossDC documentation
sysprop > envfor same pass-through key)Behavior / Compatibility
getAdditionalProperties()use remains as-is).Validation
Ran locally:
./gradlew :solr:modules:cross-dc:test --tests org.apache.solr.crossdc.common.ConfUtilTest./gradlew tidy :solr:modules:cross-dc:check -x test :solr:solr-ref-guide:check -x test