SOLR-16975: Use default solrXml if not provided

apache · Sep 13, 2023 · 85b59fa · 85b59fa
1 parent 7c3e295
commit 85b59fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -299,8 +299,8 @@ public MiniSolrCloudCluster(
             .withUrl(zkServer.getZkHost())
             .withTimeout(AbstractZkTestCase.TIMEOUT, TimeUnit.MILLISECONDS)
             .build()) {
-      zkClient.makePath("/solr", false, true);
-      if (!zkClient.exists("/solr/clusterprops.json", true)) {
+      if (!zkClient.exists("/solr", true)) {
+        zkClient.makePath("/solr", false, true);
         if (jettyConfig.sslConfig != null && jettyConfig.sslConfig.isSSLMode()) {
           zkClient.makePath(
               "/solr" + ZkStateReader.CLUSTER_PROPS,
@@ -502,9 +502,10 @@ public JettySolrRunner startJettySolrRunner(String name, JettyConfig config, Str
     nodeProps.setProperty("zkHost", zkServer.getZkAddress());
 
     Path runnerPath = createInstancePath(name);
-    if (solrXml != null) {
-      Files.write(runnerPath.resolve("solr.xml"), solrXml.getBytes(StandardCharsets.UTF_8));
+    if (solrXml == null) {
+      solrXml = DEFAULT_CLOUD_SOLR_XML;
     }
+    Files.write(runnerPath.resolve("solr.xml"), solrXml.getBytes(StandardCharsets.UTF_8));
     JettyConfig newConfig = JettyConfig.builder(config).build();
     JettySolrRunner jetty =
         !trackJettyMetrics

diff --git a/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java b/solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java
@@ -209,10 +209,11 @@ public JettySolrRunner startJettySolrRunner(
               nodeProps.setProperty("test-from-sysprop", "yup");
 
               Path runnerPath = createTempDir(name);
-              if (solrXml != null) {
-                Files.write(
-                    runnerPath.resolve("solr.xml"), solrXml.getBytes(StandardCharsets.UTF_8));
+              if (solrXml == null) {
+                solrXml = DEFAULT_CLOUD_SOLR_XML;
               }
+              Files.write(
+                  runnerPath.resolve("solr.xml"), solrXml.getBytes(StandardCharsets.UTF_8));
               JettyConfig newConfig = JettyConfig.builder(config).build();
               JettySolrRunner jetty =
                   new JettySolrRunner(runnerPath.toString(), nodeProps, newConfig);