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

Support custom log4j2 config from user-provided ConfigMap #193

Merged
merged 12 commits into from
Jan 28, 2021

Conversation

thelabdude
Copy link
Contributor

@thelabdude thelabdude commented Jan 21, 2021

Fixes: #192

SolrCloud controller now looks for the presence of a log4j2.xml key in the instance.Spec.CustomSolrKubeOptions.ConfigMapOptions.ProvidedConfigMap

The only tricky aspect of this PR is we don't save the md5 in an annotation if the provided Log4j2 config includes monitorInterval= as we don't need to trigger a restart of the Solr pods as Log4j2 will reload the config at runtime. If the config does not include monitorInterval, then we save the md5 hash of the XML in an annotation on the pod spec to trigger a restart as we do for solr.xml

Also, cleaned up some constant string usage around solr.xml and log4j2.xml

@thelabdude
Copy link
Contributor Author

Now with docs! ;-)

Copy link
Contributor

@HoustonPutman HoustonPutman left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@thelabdude thelabdude merged commit 864ed23 into apache:main Jan 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support custom log4j2.xml via user-provided ConfigMap
2 participants