Apache Solr open-source search software
SOLR-17864: Migrate System Properties Part Nueve (#3628)
Eric Pugh074392ae78ff
diff --git a/solr/benchmark/src/resources/solr.xml b/solr/benchmark/src/resources/solr.xmlindex c7c6b44a362..586c90f9e74 100644--- a/solr/benchmark/src/resources/solr.xml+++ b/solr/benchmark/src/resources/solr.xml@@ -38,7 +38,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:60000}</int> <!-- This should be high by default - dc's are expensive -->+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:60000}</int> <!-- This should be high by default - dc's are expensive --><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:15000}</int> <!-- We are running tests - the default should be low, not like production --><int name="leaderConflictResolveWait">${leaderConflictResolveWait:45000}</int>diff --git a/solr/bin/solr b/solr/bin/solrindex 1ef0e57b46f..ec54e027a26 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -1067,7 +1067,7 @@ fiif [ "${SOLR_MODE:-}" == 'solrcloud' ]; then: "${ZK_CLIENT_TIMEOUT:=30000}"- CLOUD_MODE_OPTS=("-DzkClientTimeout=$ZK_CLIENT_TIMEOUT")+ CLOUD_MODE_OPTS=("-Dsolr.zookeeper.client.timeout=$ZK_CLIENT_TIMEOUT")if [ -n "${ZK_HOST:-}" ]; thenCLOUD_MODE_OPTS+=("-DzkHost=$ZK_HOST")diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex d3947dfb555..c679da7f794 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -914,7 +914,7 @@ IF "%SOLR_MODE%"=="" set SOLR_MODE=solrcloudIF "%SOLR_MODE%"=="solrcloud" (IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=30000"- set "CLOUD_MODE_OPTS=-DzkClientTimeout=!ZK_CLIENT_TIMEOUT!"+ set "CLOUD_MODE_OPTS=-Dsolr.zookeeper.client.timeout=!ZK_CLIENT_TIMEOUT!"IF NOT "%ZK_HOST%"=="" (set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -DzkHost=%ZK_HOST%"diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.javaindex 158ecea21d9..b16027f8f4b 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java@@ -70,6 +70,7 @@ import org.apache.solr.common.params.CommonAdminParams;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.common.util.EnvUtils;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.common.util.Utils;@@ -92,7 +93,7 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {private static final int DEFAULT_NUM_SUB_SHARDS = 2;public static final String SHARDSPLIT_CHECKDISKSPACE_ENABLED =- "solr.shardSplit.checkDiskSpace.enabled";+ "solr.cloud.shardsplit.checkdiskspace.enabled";private final CollectionCommandContext ccc;@@ -193,8 +194,8 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {RTimerTree t;if (ccc.getCoreContainer().getNodeConfig().getMetricsConfig().isEnabled()) {- // check disk space for shard split- if (Boolean.parseBoolean(System.getProperty(SHARDSPLIT_CHECKDISKSPACE_ENABLED, "true"))) {+ // check disk space before shard split+ if (EnvUtils.getPropertyAsBool(SHARDSPLIT_CHECKDISKSPACE_ENABLED, true)) {// 1. verify that there is enough space on disk to create sub-shardslog.debug("SplitShardCmd: verify that there is enough space on disk to create sub-shards for slice: {}",diff --git a/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java b/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.javaindex d89326f2d80..64c4cb3a289 100644--- a/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java+++ b/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java@@ -22,6 +22,7 @@ import java.util.Map;import java.util.Objects;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.CollectionUtil;+import org.apache.solr.common.util.EnvUtils;import org.apache.solr.search.StrParser;import org.apache.solr.search.SyntaxError;@@ -96,7 +97,7 @@ public class MacroExpander {}private Boolean isExpandingExpr() {- return Boolean.valueOf(System.getProperty("StreamingExpressionMacros", "false"));+ return EnvUtils.getPropertyAsBool("solr.streamingexpressions.macros.enabled", false);}public String expand(String val) {diff --git a/solr/core/src/test-files/solr/solr-jmxreporter.xml b/solr/core/src/test-files/solr/solr-jmxreporter.xmlindex 1a2a8365a27..c54f9495013 100644--- a/solr/core/src/test-files/solr/solr-jmxreporter.xml+++ b/solr/core/src/test-files/solr/solr-jmxreporter.xml@@ -26,7 +26,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:10000}</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml b/solr/core/src/test-files/solr/solr-trackingshardhandler.xmlindex 532a03aacd7..29306d9b423 100644--- a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml+++ b/solr/core/src/test-files/solr/solr-trackingshardhandler.xml@@ -29,7 +29,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int><int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>diff --git a/solr/core/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xmlindex 9b34042f256..dfb9419efcc 100644--- a/solr/core/src/test-files/solr/solr.xml+++ b/solr/core/src/test-files/solr/solr.xml@@ -40,7 +40,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:60000}</int> <!-- This should be high by default - dc's are expensive -->+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:60000}</int> <!-- This should be high by default - dc's are expensive --><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:15000}</int> <!-- We are running tests - the default should be low, not like production --><int name="leaderConflictResolveWait">${leaderConflictResolveWait:45000}</int>diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.javaindex 66956d90ae2..7f91caaea44 100644--- a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java@@ -50,7 +50,7 @@ public class CreateCollectionCleanupTest extends SolrCloudTestCase {+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">10000</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.javaindex 6368c665e77..a328fad5589 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java@@ -58,7 +58,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase {@Overridepublic void setUp() throws Exception {super.setUp();- System.setProperty("solr.zkclienttimeout", "45000");+ System.setProperty("solr.zookeeper.client.timeout", "45000");System.setProperty("distribUpdateSoTimeout", "15000");// these tests need to be isolated, so we don't share the miniclusterdiff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex b9576d81e38..770742c4547 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -347,7 +347,7 @@ public class OverseerTest extends SolrTestCaseJ4 {public static void beforeClass() throws Exception {assumeWorkingMockito();- System.setProperty("solr.zkclienttimeout", "30000");+ System.setProperty("solr.zookeeper.client.timeout", "30000");Path zkDir = createTempDir("zkData");@@ -373,7 +373,7 @@ public class OverseerTest extends SolrTestCaseJ4 {zkClient.printLayoutToStream(System.out);}- System.clearProperty("solr.zkclienttimeout");+ System.clearProperty("solr.zookeeper.client.timeout");if (null != server) {server.shutdown();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.javaindex 0d68f2f1993..b9a2707f5b3 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java@@ -73,7 +73,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {@BeforeClasspublic static void setupCluster() throws Exception {- System.setProperty("solr.zkclienttimeout", "20000");+ System.setProperty("solr.zookeeper.client.timeout", "20000");configureCluster(4).addConfig("conf", configset("cloud-minimal")).configure();// Add proxiesdiff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.javaindex 06a664aef5a..5d43631106d 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java@@ -51,7 +51,7 @@ public class LocalFSCloudIncrementalBackupTest extends AbstractIncrementalBackup+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">10000</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"diff --git a/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java b/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.javaindex b17d99f1b91..231fa299c94 100644--- a/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java+++ b/solr/core/src/test/org/apache/solr/request/macro/TestMacroExpander.java@@ -138,8 +138,8 @@ public class TestMacroExpander extends SolrTestCase {request.put("three_ref", new String[] {"three"});// I believe that so long as this is sure to be reset before the end of the test we should// be fine with respect to other tests.- String oldVal = System.getProperty("StreamingExpressionMacros", "false");- System.setProperty("StreamingExpressionMacros", "true");+ String oldVal = System.getProperty("solr.streamingexpressions.macros.enabled", "false");+ System.setProperty("solr.streamingexpressions.macros.enabled", "true");try {Map<String, String[]> expanded = MacroExpander.expand(request);assertEquals("zero", expanded.get("fq")[0]);@@ -148,7 +148,7 @@ public class TestMacroExpander extends SolrTestCase {assertEquals("three", expanded.get("fq")[3]);assertEquals("one", expanded.get("expr")[0]);} finally {- System.setProperty("StreamingExpressionMacros", oldVal);+ System.setProperty("solr.streamingexpressions.macros.enabled", oldVal);}}diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.javaindex e8300147322..72ae3b2d47e 100644--- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java+++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java@@ -48,7 +48,7 @@ public class GCSIncrementalBackupTest extends AbstractIncrementalBackupTest {+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">10000</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"diff --git a/solr/modules/llm/src/test-files/solr/solr.xml b/solr/modules/llm/src/test-files/solr/solr.xmlindex 7506c1c8951..21a4bd17b0b 100644--- a/solr/modules/llm/src/test-files/solr/solr.xml+++ b/solr/modules/llm/src/test-files/solr/solr.xml@@ -31,7 +31,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:10000}</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/modules/ltr/src/test-files/solr/solr.xml b/solr/modules/ltr/src/test-files/solr/solr.xmlindex 7506c1c8951..21a4bd17b0b 100644--- a/solr/modules/ltr/src/test-files/solr/solr.xml+++ b/solr/modules/ltr/src/test-files/solr/solr.xml@@ -31,7 +31,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:10000}</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/modules/opentelemetry/src/test-files/solr/solr.xml b/solr/modules/opentelemetry/src/test-files/solr/solr.xmlindex 76926369f0d..1e360085e82 100644--- a/solr/modules/opentelemetry/src/test-files/solr/solr.xml+++ b/solr/modules/opentelemetry/src/test-files/solr/solr.xml@@ -39,7 +39,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:10000}</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.javaindex 17223f6deb2..2ba9479ab45 100644--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java@@ -57,7 +57,7 @@ public class S3IncrementalBackupTest extends AbstractIncrementalBackupTest {+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">10000</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"diff --git a/solr/prometheus-exporter/src/test-files/solr/solr.xml b/solr/prometheus-exporter/src/test-files/solr/solr.xmlindex 33ea82a72c5..057aee1b3f7 100644--- a/solr/prometheus-exporter/src/test-files/solr/solr.xml+++ b/solr/prometheus-exporter/src/test-files/solr/solr.xml@@ -32,7 +32,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">${leaderVoteWait:10000}</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/solr-properties.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-properties.adocindex aaf9e9f3c56..d7cda01d3a6 100644--- a/solr/solr-ref-guide/modules/configuration-guide/pages/solr-properties.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/solr-properties.adoc@@ -38,6 +38,8 @@ NOTE: Properties marked with "!" indicate inverted meaning between old and new p|solr.circuitbreaker.errorcode||503|Defines the HTTP error code returned when a circuit breaker is triggered.+|solr.cloud.shardsplit.checkdiskspace.enabled|solr.shardSplit.checkDiskSpace.enabled|true|Controls whether to check for disk space before shard split+|solr.cloud.prep.recovery.read.timeout.additional.ms|prepRecoveryReadTimeoutExtraWait|8000|Specifies additional milliseconds to wait during recovery read operations in SolrCloud mode.|solr.cloud.startup.delete.unknown.cores.enabled|solr.deleteUnknownCores|false|Controls whether unknown cores are deleted at startup in SolrCloud mode.@@ -88,12 +90,19 @@ NOTE: Properties marked with "!" indicate inverted meaning between old and new p|solr.streamingexpressions.facet.tiered.enabled|solr.facet.stream.tiered|true|Controls whether tiered faceting is enabled for streaming expressions.+|solr.streamingexpressions.macros.enabled|StreamingExpressionMacros|false|Controls whether to expand URL parameters inside of the `expr` parameter.++|solr.tracing.always.on.enabled|solr.alwaysOnTraceId|true|Controls whether trace IDs are always generated, even when no request contains a trace ID.|solr.ui.enabled|!disableAdminUI|true|Controls whether the Solr Admin UI is enabled. When set to `true`, the Solr Admin UI is enabled.|solr.ui.experimental.enabled|!solr.admin.ui.experimental.disabled|true|Controls whether experimental features in the Solr Admin UI are enabled. When set to `true`, experimental features in the UI are enabled.+|solr.zookeeper.client.connect.timeout|zkConnectTimeout|15 seconds.|How long before timing out opening connection to ZooKeeper.++|solr.zookeeper.client.timeout|zkClientTimeout|30 seconds.|How long before timing out connection to ZooKeeper.+|solr.zookeeper.chroot.create|createZkChroot|false|Controls whether a ZooKeeper chroot is created if it doesn't exist.|solr.zookeeper.embedded.host|solr.zk.embedded.host|127.0.0.1|Sets the network interface the Embedded ZooKeeper binds to.diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adocindex 71bcff98911..e623424b6aa 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc@@ -277,7 +277,7 @@ If the status is anything other than "success", an error message will explain wh=== Miscellaneous ConfigurationWhen splitting a shard, a free disk space check is performed on the local file system of the leader shard.-This can be disabled through the `solr.shardSplit.checkDiskSpace.enabled` system property (i.e. `-Dsolr.shardSplit.checkDiskSpace.enabled=false`).+This can be disabled through the `solr.cloud.shardsplit.checkdiskspace.enabled` system property (i.e. `-Dsolr.cloud.shardsplit.checkdiskspace.enabled=false`).[[createshard]]== CREATESHARD: Create a Sharddiff --git a/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xmlindex c4413d38ce3..518621dfad7 100644--- a/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml+++ b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml@@ -36,7 +36,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">0</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.javaindex a7c8d370a88..cd2c3272111 100644--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java@@ -493,8 +493,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {@Testpublic void testParameterSubstitution() throws Exception {- String oldVal = System.getProperty("StreamingExpressionMacros", "false");- System.setProperty("StreamingExpressionMacros", "true");+ String oldVal = System.getProperty("solr.streamingexpressions.macros.enabled", "false");+ System.setProperty("solr.streamingexpressions.macros.enabled", "true");try {new UpdateRequest().add(id, "0", "a_s", "hello0", "a_i", "0", "a_f", "0")@@ -549,7 +549,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {assertEquals(5, tuples.size());assertOrder(tuples, 0, 2, 1, 3, 4);} finally {- System.setProperty("StreamingExpressionMacros", oldVal);+ System.setProperty("solr.streamingexpressions.macros.enabled", oldVal);}}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.javaindex a46f269060b..dbdeb16094a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java@@ -16,12 +16,15 @@*/package org.apache.solr.client.solrj.impl;+import org.apache.solr.common.util.EnvUtils;+public class SolrZkClientTimeout {- public static final int DEFAULT_ZK_CLIENT_TIMEOUT = Integer.getInteger("zkClientTimeout", 30000);+ public static final int DEFAULT_ZK_CLIENT_TIMEOUT =+ EnvUtils.getPropertyAsInteger("solr.zookeeper.client.timeout", 30000);// Make this overridable for tests. A lot take 15 seconds to timeout because of this.// or CURATOR-720public static final int DEFAULT_ZK_CONNECT_TIMEOUT =- Integer.getInteger("zkConnectTimeout", 15000);+ EnvUtils.getPropertyAsInteger("solr.zookeeper.client.connect.timeout", 15000);interface SolrZkClientTimeoutAware {void setZkClientTimeout(int zkClientTimeout);diff --git a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.propertiesindex 6b8b4d697ae..853256bb411 100644--- a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties+++ b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties@@ -14,6 +14,7 @@ solr.api.v2.enabled=!disable.v2.apisolr.auth.jwt.outbound.http.enabled=solr.auth.jwt.allow.outbound.httpsolr.auth.superuser=solr.authorization.superuser+solr.cloud.shardsplit.checkdiskspace.enabled=solr.shard.split.check.disk.space.enabledsolr.cloud.prep.recovery.read.timeout.additional.ms=prep.recovery.read.timeout.extra.waitsolr.cloud.prs.enabled=solr.prs.defaultsolr.cloud.startup.delete.unknown.cores.enabled=solr.delete.unknown.cores@@ -50,12 +51,14 @@ solr.security.auth.plugin=authentication.pluginsolr.solrj.cloud.max.stale.retries=cloud.solr.client.max.stale.retriessolr.streamingexpressions.facet.tiered.enabled=solr.facet.stream.tiered+solr.streamingexpressions.macros.enabled=streaming.expression.macrossolr.tracing.always.on.enabled=solr.always.on.trace.idsolr.ui.enabled=!solr.admin.ui.disabledsolr.ui.experimental.enabled=!solr.admin.ui.experimental.disabled+solr.zookeeper.client.timeout=zk.client.timeoutsolr.zookeeper.chroot.create=create.zk.chrootsolr.zookeeper.server.confdir=zk.server.conf.dirsolr.zookeeper.server.datadir=zk.server.data.dirdiff --git a/solr/solrj/src/resources/EnvToSyspropMappings.properties b/solr/solrj/src/resources/EnvToSyspropMappings.propertiesindex d20b594142a..4b66f843271 100644--- a/solr/solrj/src/resources/EnvToSyspropMappings.properties+++ b/solr/solrj/src/resources/EnvToSyspropMappings.properties@@ -38,7 +38,7 @@ SOLR_MAX_BOOLEAN_CLAUSES=solr.max.booleanClausesSOLR_METRICS_ENABLED=metricsEnabledSOLR_SHARED_LIB=solr.sharedLibSOLR_ZK_ACL_PROVIDER=zkACLProvider-SOLR_ZK_CLIENT_TIMEOUT=solr.zkclienttimeout+SOLR_ZK_CLIENT_TIMEOUT=solr.zookeeper.client.timeoutSOLR_ZK_CREDENTIALS_INJECTOR=zkCredentialsInjectorSOLR_ZK_CREDENTIALS_PROVIDER=zkCredentialsProviderdiff --git a/solr/solrj/src/test-files/solrj/solr/shared/solr.xml b/solr/solrj/src/test-files/solrj/solr/shared/solr.xmlindex aefabeaa6a2..ffc06e28893 100644--- a/solr/solrj/src/test-files/solrj/solr/shared/solr.xml+++ b/solr/solrj/src/test-files/solrj/solr/shared/solr.xml@@ -31,7 +31,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">0</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/solrj/src/test-files/solrj/solr/solr.xml b/solr/solrj/src/test-files/solrj/solr/solr.xmlindex 81e2e31ac8a..d99d1a1c56f 100644--- a/solr/solrj/src/test-files/solrj/solr/solr.xml+++ b/solr/solrj/src/test-files/solrj/solr/solr.xml@@ -36,7 +36,7 @@<solrcloud><str name="host">127.0.0.1</str><int name="hostPort">${hostPort:8983}</int>- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>+ <int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int><bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool><int name="leaderVoteWait">0</int><int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex bb06061a73c..c49c6843923 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -266,7 +266,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {// non-null after calling setupTestCases()initAndGetDataDir();- System.setProperty("solr.zkclienttimeout", "90000");+ System.setProperty("solr.zookeeper.client.timeout", "90000");System.setProperty("solr.httpclient.retries", "1");System.setProperty("solr.retries.on.forward", "1");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.javaindex 4c75533ed35..c15e4245f0f 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java@@ -124,7 +124,7 @@ public class MiniSolrCloudCluster {+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">${leaderVoteWait:10000}</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.javaindex ecac1c49464..5d4c695b4ee 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java@@ -260,7 +260,7 @@ public abstract class AbstractInstallShardTest extends SolrCloudTestCase {+ " <solrcloud>\n"+ " <str name=\"host\">127.0.0.1</str>\n"+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"- + " <int name=\"zkClientTimeout\">${solr.zkclienttimeout:30000}</int>\n"+ + " <int name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"+ " <bool name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"+ " <int name=\"leaderVoteWait\">10000</int>\n"+ " <int name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"