markrmiller commented on a change in pull request #214:
URL: https://github.com/apache/solr/pull/214#discussion_r683080378
##########
File path:
solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
##########
@@ -295,12 +280,14 @@ public MiniSolrCloudCluster(int numServers, Path baseDir,
String solrXml, JettyC
this.zkServer = zkTestServer;
try (SolrZkClient zkClient = new SolrZkClient(zkServer.getZkHost(),
AbstractZkTestCase.TIMEOUT)) {
- zkClient.makePath("/solr/solr.xml",
solrXml.getBytes(Charset.defaultCharset()), true);
- if (jettyConfig.sslConfig != null && jettyConfig.sslConfig.isSSLMode()) {
- zkClient.makePath("/solr" + ZkStateReader.CLUSTER_PROPS,
"{'urlScheme':'https'}".getBytes(StandardCharsets.UTF_8), true);
- }
- if (securityJson.isPresent()) { // configure Solr security
- zkClient.makePath("/solr/security.json",
securityJson.get().getBytes(Charset.defaultCharset()), true);
+ if (!zkClient.exists("/solr/solr.xml", true)) {
+ zkClient.makePath("/solr/solr.xml",
solrXml.getBytes(Charset.defaultCharset()), true);
+ if (jettyConfig.sslConfig != null &&
jettyConfig.sslConfig.isSSLMode()) {
+ zkClient.makePath("/solr" + ZkStateReader.CLUSTER_PROPS,
"{'urlScheme':'https'}".getBytes(StandardCharsets.UTF_8), true);
+ }
+ if (securityJson.isPresent()) { // configure Solr security
+ zkClient.makePath("/solr/security.json",
securityJson.get().getBytes(Charset.defaultCharset()), true);
+ }
}
}
Review comment:
@sonatype-lift ignore
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
