I dont love a system propery just for one test, but at least the name cues you in now

epugh · epugh · commit af2fe0e820c5 · 2025-08-19T06:30:42.000-04:00
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
@@ -248,7 +248,7 @@ public static NodeConfig loadNodeConfig(Path solrHome, Properties nodeProperties
     //  ZkFailoverTest test case...
     String zkHost = nodeProperties.getProperty(SolrXmlConfig.ZK_HOST);
     if (StrUtils.isNotNullOrEmpty(zkHost)) {
-      int startUpZkTimeOut = 1000 * Integer.getInteger("solr.wait.for.zk", 0);
+      int startUpZkTimeOut = 1000 * Integer.getInteger("solr.tests.wait.for.zk.seconds", 0);
       if (startUpZkTimeOut == 0) {
         startUpZkTimeOut = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
       }
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java
@@ -47,7 +47,7 @@ public static void setupCluster() throws Exception {
 
   @AfterClass
   public static void resetWaitForZk() {
-    System.setProperty("solr.wait.for.zk", "30");
+    System.setProperty("solr.tests.wait.for.zk.seconds", "30");
   }
 
   public void testRestartZkWhenClusterDown() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public static NodeConfig loadNodeConfig(Path solrHome, Properties nodeProperties`
`248`	`248`	`// ZkFailoverTest test case...`
`249`	`249`	`String zkHost = nodeProperties.getProperty(SolrXmlConfig.ZK_HOST);`
`250`	`250`	`if (StrUtils.isNotNullOrEmpty(zkHost)) {`
`251`		`- int startUpZkTimeOut = 1000 * Integer.getInteger("solr.wait.for.zk", 0);`
	`251`	`+ int startUpZkTimeOut = 1000 * Integer.getInteger("solr.tests.wait.for.zk.seconds", 0);`
`252`	`252`	`if (startUpZkTimeOut == 0) {`
`253`	`253`	`startUpZkTimeOut = SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void setupCluster() throws Exception {`
`47`	`47`
`48`	`48`	`@AfterClass`
`49`	`49`	`public static void resetWaitForZk() {`
`50`		`- System.setProperty("solr.wait.for.zk", "30");`
	`50`	`+ System.setProperty("solr.tests.wait.for.zk.seconds", "30");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public void testRestartZkWhenClusterDown() throws Exception {`