-
Notifications
You must be signed in to change notification settings - Fork 674
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
SOLR-16975: Remove loading of solr.xml from zookeeper (main branch only) #1920
SOLR-16975: Remove loading of solr.xml from zookeeper (main branch only) #1920
Conversation
solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
Outdated
Show resolved
Hide resolved
# Conflicts: # solr/CHANGES.txt
|
||
// TODO: Only job of this block is to | ||
// delay starting a solr core to satisfy | ||
// ZkFailoverTest test case... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rewrite ZkFailoverTest to enforce a failed restart of cluster in a different way than relying on this sysprop hack...
So I fixed the last tests and broguht back some ZK connection code to Final review welcome. @dsmiley ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
Sad TODO there :-(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Jan!
https://issues.apache.org/jira/browse/SOLR-16975
Solr will now fail and exit if it finds
/solr.xml
in zookeeper, with a message on how to remove it.Have also cleaned up docs and some scripts that used
/solr.xml
as example of how to upload stuff to zookeeper.The
MiniSolrCloudCluster
relied on uploading a provided solr.xml to ZK, now it instead copies the provided file to each Jetty.