This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new a4334c65973 SOLR-17864: Migrate System Properties (part ocho) (#3625)
a4334c65973 is described below
commit a4334c659735542e3c2ac9eb813a40e30c605f9a
Author: Eric Pugh <[email protected]>
AuthorDate: Wed Sep 10 10:49:34 2025 -0400
SOLR-17864: Migrate System Properties (part ocho) (#3625)
Align variable name used in supporting files for tests with system property
name.
Migrate:
solr.prs.default
enable.update.log
zk.server.conf.dir
zk.server.data.dir
zk.run
solr.zk.embedded.host
zk.run.only
---
gradle/ide/eclipse/run-solr-cloud.launch | 2 +-
.../configs/cloud-minimal/conf/solrconfig.xml | 3 +-
solr/bin/solr | 8 +-
solr/bin/solr.cmd | 8 +-
solr/bin/solr.in.cmd | 2 +-
solr/bin/solr.in.sh | 2 +-
.../java/org/apache/solr/cloud/SolrZkServer.java | 45 ++++++----
.../java/org/apache/solr/cloud/ZkController.java | 95 +++++++++-------------
.../cloud/api/collections/CreateCollectionCmd.java | 6 +-
.../src/java/org/apache/solr/core/ZkContainer.java | 23 +++---
.../apache/solr/servlet/CoreContainerProvider.java | 6 +-
.../conf/solrconfig-analytics-query.xml | 2 +-
.../collection1/conf/solrconfig-classification.xml | 2 +-
.../conf/solrconfig-collapseqparser.xml | 2 +-
.../collection1/conf/solrconfig-managed-schema.xml | 2 +-
.../solr/collection1/conf/solrconfig-minhash.xml | 2 +-
.../conf/solrconfig-parallel-commit.xml | 2 +-
.../collection1/conf/solrconfig-plugcollector.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../test/org/apache/solr/TestCrossCoreJoin.java | 3 +-
.../test/org/apache/solr/TestGroupingSearch.java | 3 +-
solr/core/src/test/org/apache/solr/TestJoin.java | 3 +-
.../test/org/apache/solr/TestRandomFaceting.java | 3 +-
.../solr/cloud/TestOnReconnectListenerSupport.java | 2 +-
.../test/org/apache/solr/core/TestBadConfig.java | 4 +-
.../apache/solr/core/TestReloadAndDeleteDocs.java | 4 +-
.../apache/solr/core/TestSolrConfigHandler.java | 2 +-
.../org/apache/solr/handler/TestCSVLoader.java | 3 +-
.../solr/handler/admin/LukeRequestHandlerTest.java | 3 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 2 +-
.../solr/handler/component/TermsComponentTest.java | 3 +-
.../org/apache/solr/request/TestStreamBody.java | 2 +-
.../org/apache/solr/response/DocsStreamerTest.java | 3 +-
.../solr/response/TestCSVResponseWriter.java | 3 +-
.../solr/response/TestGraphMLResponseWriter.java | 3 +-
.../solr/response/TestJavaBinResponseWriter.java | 3 +-
.../solr/response/TestRetrieveFieldsOptimizer.java | 2 +-
.../transform/TestSubQueryTransformer.java | 2 +-
.../TestSubQueryTransformerCrossCore.java | 3 +-
.../apache/solr/rest/schema/TestBulkSchemaAPI.java | 2 +-
.../analysis/TestManagedStopFilterFactory.java | 4 +-
.../analysis/TestManagedSynonymFilterFactory.java | 4 +-
.../TestManagedSynonymGraphFilterFactory.java | 4 +-
.../apache/solr/schema/DenseVectorFieldTest.java | 4 +-
.../solr/schema/NotRequiredUniqueKeyTest.java | 3 +-
.../apache/solr/schema/PrimitiveFieldTypeTest.java | 3 +-
.../solr/schema/SpatialRPTFieldTypeTest.java | 4 +-
.../solr/schema/TestBulkSchemaConcurrent.java | 2 +-
.../apache/solr/schema/TestCloudManagedSchema.java | 2 +-
.../org/apache/solr/schema/TestManagedSchema.java | 4 +-
.../org/apache/solr/schema/TestPointFields.java | 28 +++----
.../solr/schema/TestUseDocValuesAsStored.java | 4 +-
.../solr/schema/TestUseDocValuesAsStored2.java | 2 +-
.../org/apache/solr/search/LargeFieldTest.java | 2 +-
.../org/apache/solr/search/ReturnFieldsTest.java | 3 +-
.../solr/search/TestAddFieldRealTimeGet.java | 2 +-
.../solr/search/TestExtendedDismaxParser.java | 3 +-
.../test/org/apache/solr/search/TestFiltering.java | 3 +-
.../org/apache/solr/search/TestInitQParser.java | 3 +-
.../apache/solr/search/TestSolrQueryParser.java | 3 +-
.../solr/search/join/TestScoreJoinQPNoScore.java | 3 +-
.../solr/search/join/TestScoreJoinQPScore.java | 3 +-
.../org/apache/solr/update/CustomTLogDirTest.java | 4 +-
.../solr/update/DataDrivenBlockJoinTest.java | 2 +-
.../solr/update/DirectUpdateHandlerTest.java | 3 +-
.../DirectUpdateHandlerWithUpdateLogTest.java | 2 +-
.../apache/solr/update/SolrIndexSplitterTest.java | 3 +-
.../solr/update/TestAtomicUpdateErrorCases.java | 4 +-
.../AbstractAtomicUpdatesMultivalueTestBase.java | 2 +-
.../update/processor/AtomicUpdateJsonTest.java | 2 +-
.../AtomicUpdateProcessorFactoryTest.java | 2 +-
.../solr/update/processor/AtomicUpdatesTest.java | 2 +-
...assificationUpdateProcessorIntegrationTest.java | 2 +-
.../ClassificationUpdateProcessorTest.java | 2 +-
.../processor/DistributedUpdateProcessorTest.java | 4 +-
.../update/processor/RegexBoostProcessorTest.java | 3 +-
.../UniqFieldsUpdateProcessorFactoryTest.java | 3 +-
.../conf/solrconfig-producerdisabled.xml | 2 +-
.../cloud-minimal-no-dbq/conf/solrconfig.xml | 2 +-
.../conf/solrconfig-producerdisabled.xml | 2 +-
.../configs/cloud-minimal/conf/solrconfig.xml | 2 +-
solr/docker/templates/Dockerfile.body.template | 2 +-
.../conf/solrconfig-producerdisabled.xml | 2 +-
.../cloud-minimal-no-dbq/conf/solrconfig.xml | 2 +-
.../conf/solrconfig-producerdisabled.xml | 2 +-
.../configs/cloud-minimal/conf/solrconfig.xml | 2 +-
.../handler/extraction/TestXLSXResponseWriter.java | 2 +-
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 2 +-
.../test/org/apache/solr/ltr/TestRerankBase.java | 4 +-
solr/server/solr/zoo.cfg | 2 +-
.../pages/configuring-solr-xml.adoc | 4 +-
.../configuration-guide/pages/solr-properties.adoc | 11 ++-
.../deployment-guide/pages/securing-solr.adoc | 4 +-
.../getting-started/pages/tutorial-aws.adoc | 2 +-
.../DeprecatedSystemPropertyMappings.properties | 6 ++
.../src/test-files/solrj/solr/multicore/zoo.cfg | 2 +-
.../solr/client/solrj/request/SchemaTest.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 4 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 2 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
100 files changed, 251 insertions(+), 223 deletions(-)
diff --git a/gradle/ide/eclipse/run-solr-cloud.launch
b/gradle/ide/eclipse/run-solr-cloud.launch
index 685782ceabc..1cd8734f1a4 100644
--- a/gradle/ide/eclipse/run-solr-cloud.launch
+++ b/gradle/ide/eclipse/run-solr-cloud.launch
@@ -16,5 +16,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.eclipse.jetty.start.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="--module=http"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="@ECLIPSEPROJECTNAME@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983
-DSTOP.KEY=solrrock -Dlog4j.configurationFile="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j2.xml" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -
[...]
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983
-DSTOP.KEY=solrrock -Dlog4j.configurationFile="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j2.xml" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -
[...]
</launchConfiguration>
diff --git
a/solr/benchmark/src/resources/configs/cloud-minimal/conf/solrconfig.xml
b/solr/benchmark/src/resources/configs/cloud-minimal/conf/solrconfig.xml
index 20caf3b9068..75ca540c77a 100644
--- a/solr/benchmark/src/resources/configs/cloud-minimal/conf/solrconfig.xml
+++ b/solr/benchmark/src/resources/configs/cloud-minimal/conf/solrconfig.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
@@ -109,4 +109,3 @@
</query>
</config>
-
diff --git a/solr/bin/solr b/solr/bin/solr
index c8c01161d9b..1ef0e57b46f 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -960,10 +960,6 @@ if [ -n "${SOLR_JETTY_HOST:-}" ]; then
SCRIPT_SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")
fi
-if [ -n "${SOLR_ZK_EMBEDDED_HOST:-}" ]; then
- SCRIPT_SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")
-fi
-
: "${STOP_PORT:=$((SOLR_PORT - 1000))}"
if [ "$SCRIPT_CMD" == "start" ] || [ "$SCRIPT_CMD" == "restart" ] ; then
@@ -1081,10 +1077,10 @@ if [ "${SOLR_MODE:-}" == 'solrcloud' ]; then
exit 1
fi
if $verbose ; then
- echo "Configuring SolrCloud to launch an embedded Zookeeper using
-DzkRun"
+ echo "Configuring SolrCloud to launch an embedded Zookeeper using
-Dsolr.zookeeper.server.enabled"
fi
- CLOUD_MODE_OPTS+=('-DzkRun')
+ CLOUD_MODE_OPTS+=('-Dsolr.zookeeper.server.enabled=true')
fi
if [ -n "${ZK_CREATE_CHROOT:-}" ]; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 8c261953efc..d3947dfb555 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -881,10 +881,6 @@ IF DEFINED SOLR_JETTY_HOST (
set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%"
)
-IF DEFINED SOLR_ZK_EMBEDDED_HOST (
- set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS%
-Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%"
-)
-
REM Make sure Solr is not running using netstat
For /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find
":%SOLR_PORT% "') do (
IF NOT "%%k"=="0" (
@@ -927,8 +923,8 @@ IF "%SOLR_MODE%"=="solrcloud" (
set "SCRIPT_ERROR=ZK_HOST is not set and Solr port is %SOLR_PORT%, which
would result in an invalid embedded Zookeeper port!"
goto err
)
- IF "%verbose%"=="1" echo Configuring SolrCloud to launch an embedded
Zookeeper using -DzkRun
- set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -DzkRun"
+ IF "%verbose%"=="1" echo Configuring SolrCloud to launch an embedded
Zookeeper using -Dsolr.zookeeper.server.enabled
+ set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS!
-Dsolr.zookeeper.server.enabled=true"
)
IF NOT "%ZK_CREATE_CHROOT%"=="" (
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index dc6eb300834..d6278e3490c 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -127,7 +127,7 @@ REM environments where security is not a concern, 0.0.0.0
can be used to allow
REM Solr to accept connections on all network interfaces.
REM set SOLR_JETTY_HOST=127.0.0.1
REM Sets the network interface the Embedded ZK binds to.
-REM set SOLR_ZK_EMBEDDED_HOST=127.0.0.1
+REM set SOLR_ZOOKEEPER_EMBEDDED_HOST=127.0.0.1
REM Restrict access to solr by IP address.
REM Specify a comma-separated list of addresses or networks, for example:
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index ccbcf50aa9e..b4cee92153c 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -152,7 +152,7 @@
# Solr to accept connections on all network interfaces.
#SOLR_JETTY_HOST="127.0.0.1"
# Sets the network interface the Embedded ZK binds to.
-#SOLR_ZK_EMBEDDED_HOST="127.0.0.1"
+#SOLR_ZOOKEEPER_EMBEDDED_HOST="127.0.0.1"
# Enables HTTPS. It is implictly true if you set SOLR_SSL_KEY_STORE. Use this
config
# to enable https module with custom jetty configuration.
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
index e911aff2a63..3b18f2ac7a9 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.util.AddressUtils;
import org.apache.zookeeper.server.ServerConfig;
@@ -41,19 +42,19 @@ public class SolrZkServer {
public static final String ZK_WHITELIST_PROPERTY =
"zookeeper.4lw.commands.whitelist";
- String zkRun;
+ boolean zkRun = false;
String zkHost;
int solrPort;
Properties props;
SolrZkServerProps zkProps;
- private Thread zkThread; // the thread running a zookeeper server, only if
zkRun is set
+ private Thread zkThread; // the thread running a zookeeper server, only if
zkRun is true
private Path dataHome; // o.a.zookeeper.**.QuorumPeerConfig needs a File not
a Path
private String confHome;
- public SolrZkServer(String zkRun, String zkHost, Path dataHome, String
confHome, int solrPort) {
+ public SolrZkServer(boolean zkRun, String zkHost, Path dataHome, String
confHome, int solrPort) {
this.zkRun = zkRun;
this.zkHost = zkHost;
this.dataHome = dataHome;
@@ -62,12 +63,18 @@ public class SolrZkServer {
}
public String getClientString() {
- if (zkHost != null) return zkHost;
+ if (zkHost != null) {
+ return zkHost;
+ }
- if (zkProps == null) return null;
+ if (zkProps == null) {
+ return null;
+ }
// if the string wasn't passed as zkHost, then use the standalone server
we started
- if (zkRun == null) return null;
+ if (!zkRun) {
+ return null;
+ }
InetSocketAddress addr = zkProps.getClientPortAddress();
String hostName;
@@ -110,13 +117,15 @@ public class SolrZkServer {
// This is the address that the embedded Zookeeper will bind to. Like
Solr, it defaults to
// "127.0.0.1".
props.setProperty(
- "clientPortAddress", System.getProperty("solr.zk.embedded.host",
"127.0.0.1"));
+ "clientPortAddress",
EnvUtils.getProperty("solr.zookeeper.embedded.host", "127.0.0.1"));
if (props.getProperty("clientPort") == null) {
props.setProperty("clientPort", Integer.toString(solrPort + 1000));
}
zkProps.parseProperties(props);
} catch (QuorumPeerConfig.ConfigException | IOException e) {
- if (zkRun != null) throw new
SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+ if (zkRun) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+ }
}
}
@@ -125,7 +134,9 @@ public class SolrZkServer {
}
public void start() {
- if (zkRun == null) return;
+ if (!zkRun) {
+ return;
+ }
if (System.getProperty(ZK_WHITELIST_PROPERTY) == null) {
System.setProperty(ZK_WHITELIST_PROPERTY, "ruok, mntr, conf");
@@ -192,7 +203,9 @@ public class SolrZkServer {
}
public void stop() {
- if (zkRun == null) return;
+ if (!zkRun) {
+ return;
+ }
zkThread.interrupt();
}
}
@@ -203,7 +216,7 @@ class SolrZkServerProps extends QuorumPeerConfig {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
String solrPort; // port that Solr is listening on
- String zkRun;
+ boolean zkRun;
/**
* Parse a ZooKeeper configuration file
@@ -232,13 +245,15 @@ class SolrZkServerProps extends QuorumPeerConfig {
// Given zkHost=localhost:1111,localhost:2222 this will inject
// server.0=localhost:1112:1113
// server.1=localhost:2223:2224
- public static void injectServers(Properties props, String zkRun, String
zkHost) {
+ public static void injectServers(Properties props, boolean zkRun, String
zkHost) {
// if clientPort not already set, use zkRun
- if (zkRun != null && props.getProperty("clientPort") == null) {
- int portIdx = zkRun.lastIndexOf(':');
+ if (zkRun && props.getProperty("clientPort") == null) {
+ // int portIdx = zkRun.lastIndexOf(':');
+ int portIdx = "".lastIndexOf(':');
if (portIdx > 0) {
- String portStr = zkRun.substring(portIdx + 1);
+ // String portStr = zkRun.substring(portIdx + 1);
+ String portStr = "".substring(portIdx + 1);
props.setProperty("clientPort", portStr);
}
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 248d46272ba..df00ee0dcaf 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -254,12 +254,6 @@ public class ZkController implements Closeable {
// keeps track of replicas that have been asked to recover by leaders
running on this node
private final Map<String, String> replicasInLeaderInitiatedRecovery = new
HashMap<>();
- // This is an expert and unsupported development mode that does not create
- // an Overseer or register a /live node. This let's you monitor the cluster
- // and interact with zookeeper via the Solr admin UI on a node outside the
cluster,
- // and so one that will not be killed or stopped when testing. See developer
cloud-scripts.
- private boolean zkRunOnly = Boolean.getBoolean("zkRunOnly"); // expert
-
// keeps track of a list of objects that need to know a new ZooKeeper
session was created after
// expiration occurred ref is held as a HashSet since we clone the set
before notifying to avoid
// synchronizing too long
@@ -367,7 +361,7 @@ public class ZkController implements Closeable {
.getCuratorFramework()
.getConnectionStateListenable()
.addListener(onDisconnect, zkConnectionListenerCallbackExecutor);
- // Refuse to start if ZK has a non empty /clusterstate.json or a /solr.xml
file
+ // Refuse to start if ZK has a non-empty /clusterstate.json or a /solr.xml
file
checkNoOldClusterstate(zkClient);
this.overseerRunningMap = Overseer.getRunningMap(zkClient);
@@ -468,20 +462,18 @@ public class ZkController implements Closeable {
// Overseer.createClientNodes(zkClient, getNodeName());
// start the overseer first as following code may need it's processing
- if (!zkRunOnly) {
- ElectionContext context = new OverseerElectionContext(zkClient,
overseer, getNodeName());
+ ElectionContext context = new OverseerElectionContext(zkClient,
overseer, getNodeName());
- ElectionContext prevContext = overseerElector.getContext();
- if (prevContext != null) {
- prevContext.cancelElection();
- prevContext.close();
- }
+ ElectionContext prevContext = overseerElector.getContext();
+ if (prevContext != null) {
+ prevContext.cancelElection();
+ prevContext.close();
+ }
- overseerElector.setup(context);
+ overseerElector.setup(context);
- if (cc.nodeRoles.isOverseerAllowedOrPreferred()) {
- overseerElector.joinElection(context, true);
- }
+ if (cc.nodeRoles.isOverseerAllowedOrPreferred()) {
+ overseerElector.joinElection(context, true);
}
cc.cancelCoreRecoveries();
@@ -492,7 +484,7 @@ public class ZkController implements Closeable {
// zk has to reconnect and this will all be tried again
throw e;
} catch (Exception e) {
- // this is really best effort - in case of races or failure cases
where we now
+ // this is just best effort - in case of races or failure cases where
we now
// need to be the leader, if anything fails, just continue
log.warn("Exception while trying to register all cores as DOWN", e);
}
@@ -1087,21 +1079,19 @@ public class ZkController implements Closeable {
// Start the overseer now since the following code may need it's
processing.
// Note: even when using distributed processing, we still create an
Overseer anyway since
// cluster singleton processing is linked to the elected Overseer.
- if (!zkRunOnly) {
- overseerElector = new LeaderElector(zkClient);
- this.overseer =
- new Overseer(
- (HttpShardHandler)
cc.getShardHandlerFactory().getShardHandler(),
- cc.getUpdateShardHandler(),
- CommonParams.CORES_HANDLER_PATH,
- zkStateReader,
- this,
- cloudConfig);
- ElectionContext context = new OverseerElectionContext(zkClient,
overseer, getNodeName());
- overseerElector.setup(context);
- if (cc.nodeRoles.isOverseerAllowedOrPreferred()) {
- overseerElector.joinElection(context, false);
- }
+ overseerElector = new LeaderElector(zkClient);
+ this.overseer =
+ new Overseer(
+ (HttpShardHandler) cc.getShardHandlerFactory().getShardHandler(),
+ cc.getUpdateShardHandler(),
+ CommonParams.CORES_HANDLER_PATH,
+ zkStateReader,
+ this,
+ cloudConfig);
+ ElectionContext context = new OverseerElectionContext(zkClient,
overseer, getNodeName());
+ overseerElector.setup(context);
+ if (cc.nodeRoles.isOverseerAllowedOrPreferred()) {
+ overseerElector.joinElection(context, false);
}
Stat stat = zkClient.exists(ZkStateReader.LIVE_NODES_ZKNODE, null, true);
@@ -1123,9 +1113,6 @@ public class ZkController implements Closeable {
}
private void checkForExistingEphemeralNode() throws KeeperException,
InterruptedException {
- if (zkRunOnly) {
- return;
- }
String nodeName = getNodeName();
String nodePath = ZkStateReader.LIVE_NODES_ZKNODE + "/" + nodeName;
@@ -1263,10 +1250,6 @@ public class ZkController implements Closeable {
}
private void createEphemeralLiveNode() throws KeeperException,
InterruptedException {
- if (zkRunOnly) {
- return;
- }
-
String nodeName = getNodeName();
String nodePath = ZkStateReader.LIVE_NODES_ZKNODE + "/" + nodeName;
log.info("Register node as live in ZooKeeper: {}", nodePath);
@@ -1277,7 +1260,7 @@ public class ZkController implements Closeable {
ops.add(
op -> op.create().withMode(CreateMode.EPHEMERAL).forPath(nodePath,
buildLiveNodeData()));
- // Create the roles node as well
+ // Create the roles nodes as well
roles.forEach(
(role, mode) ->
ops.add(
@@ -1301,9 +1284,6 @@ public class ZkController implements Closeable {
}
public void removeEphemeralLiveNode() throws KeeperException,
InterruptedException {
- if (zkRunOnly) {
- return;
- }
String nodeName = getNodeName();
String nodePath = ZkStateReader.LIVE_NODES_ZKNODE + "/" + nodeName;
log.info("Remove node as live in ZooKeeper:{}", nodePath);
@@ -1360,7 +1340,7 @@ public class ZkController implements Closeable {
throws Exception {
MDCLoggingContext.setCoreDescriptor(cc, desc);
try {
- // pre register has published our down state
+ // preregister has published our down state
final String baseUrl = getBaseUrl();
final CloudDescriptor cloudDesc = desc.getCloudDescriptor();
final String collection = cloudDesc.getCollectionName();
@@ -1516,7 +1496,7 @@ public class ZkController implements Closeable {
}
if (replica.getType().leaderEligible) {
- // the watcher is added to a set so multiple calls of this method
will left only one
+ // the watcher is added to a set so multiple calls of this method
will leave only one
// watcher
shardTerms.addListener(
new RecoveringCoreTermWatcher(core.getCoreDescriptor(),
getCoreContainer()));
@@ -1529,7 +1509,7 @@ public class ZkController implements Closeable {
// make sure we have an update cluster state right away
zkStateReader.forceUpdateCollection(collection);
- // the watcher is added to a set so multiple calls of this method will
left only one watcher
+ // the watcher is added to a set so multiple calls of this method will
leave only one watcher
zkStateReader.registerDocCollectionWatcher(
cloudDesc.getCollectionName(),
new UnloadCoreOnDeletedWatcher(coreZkNodeName, shardId,
desc.getName()));
@@ -1645,7 +1625,7 @@ public class ZkController implements Closeable {
leaderUrl = getLeaderProps(collection, cloudDesc.getShardId(),
timeoutms).getCoreUrl();
// now wait until our currently cloud state contains the latest leader
since we found it in
- // zk, we are willing to wait a while to find it in state
+ // zk, we are willing to wait awhile to find it in state
String clusterStateLeaderUrl = zkStateReader.getLeaderUrl(collection,
shardId, timeoutms * 2);
int tries = 0;
final int msInSec = 1000;
@@ -1778,7 +1758,7 @@ public class ZkController implements Closeable {
leaderElector.joinElection(context, false, joinAtHead);
}
- /** Returns whether or not a recovery was started */
+ /** Returns whether a recovery was started */
private boolean checkRecovery(
boolean recoverReloadedCores,
final boolean isLeader,
@@ -2075,7 +2055,7 @@ public class ZkController implements Closeable {
ClusterStateMutator.getAssignedCoreNodeName(
c, getNodeName(), descriptor.getName())
!= null);
- // Read outside of the predicate to avoid multiple potential writes
+ // Read outside the predicate to avoid multiple potential writes
String name =
ClusterStateMutator.getAssignedCoreNodeName(
collection, getNodeName(), descriptor.getName());
@@ -2098,7 +2078,7 @@ public class ZkController implements Closeable {
320,
TimeUnit.SECONDS,
c -> c != null && c.getShardId(getNodeName(), cd.getName()) !=
null);
- // Read outside of the predicate to avoid multiple potential writes
+ // Read outside the predicate to avoid multiple potential writes
cd.getCloudDescriptor().setShardId(collection.getShardId(getNodeName(),
cd.getName()));
} catch (TimeoutException | InterruptedException e) {
SolrZkClient.checkInterrupted(e);
@@ -2327,7 +2307,8 @@ public class ZkController implements Closeable {
leaderProps.getCoreUrl());
}
- // short timeouts, we may be in a storm and this is best effort, and
maybe we should be the
+ // short timeouts, we may be in a storm and this is just best effort,
and maybe we should be
+ // the
// leader now
try (SolrClient client =
new Builder(leaderBaseUrl)
@@ -2340,7 +2321,7 @@ public class ZkController implements Closeable {
prepCmd.setCoreNodeName(coreZkNodeName);
prepCmd.setState(Replica.State.DOWN);
- // lets give it another chance, but without taking too long
+ // let's give it another chance, but without taking too long
retries = 3;
for (int i = 0; i < retries; i++) {
if (isClosed) {
@@ -2403,7 +2384,7 @@ public class ZkController implements Closeable {
data = zkClient.getData(path, null, null, true);
} catch (NoNodeException e) {
// if there is no node, we will try and create it
- // first try to make in case we are pre configuring
+ // first try to make in case we are pre-configuring
ZkNodeProps props = new ZkNodeProps(CONFIGNAME_PROP, confSetName);
try {
@@ -2532,7 +2513,7 @@ public class ZkController implements Closeable {
"Asked to rejoin with wrong election node : {}, current node is
{}",
electionNode,
context.leaderSeqPath);
- // however delete it . This is possible when the last attempt at
deleting the election
+ // however, delete it. This is possible when the last attempt at
deleting the election
// node failed.
if (electionNode.startsWith(getNodeName())) {
try {
@@ -3005,7 +2986,7 @@ public class ZkController implements Closeable {
}
}
- /** Thrown during pre register process if the replica is not present in
clusterstate */
+ /** Thrown during preregister process if the replica is not present in
clusterstate */
public static class NotInClusterStateException extends SolrException {
public NotInClusterStateException(ErrorCode code, String msg) {
super(code, msg);
diff --git
a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index b3f1b4c5380..34ca3d0e288 100644
---
a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++
b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@ -95,7 +95,7 @@ public class CreateCollectionCmd implements
CollApiCmds.CollectionApiCommand {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final CollectionCommandContext ccc;
- public static final String PRS_DEFAULT_PROP = "solr.prs.default";
+ public static final String PRS_DEFAULT_PROP = "solr.cloud.prs.enabled";
public CreateCollectionCmd(CollectionCommandContext ccc) {
this.ccc = ccc;
@@ -116,8 +116,8 @@ public class CreateCollectionCmd implements
CollApiCmds.CollectionApiCommand {
final boolean isPRS =
message.getBool(CollectionStateProps.PER_REPLICA_STATE, prsDefault);
if (log.isInfoEnabled()) {
log.info(
- "solr.prs.default : {} and collection prs : {}, isPRS : {}",
- System.getProperty("solr.prs.default", null),
+ "solr.cloud.prs.enabled : {} and collection prs : {}, isPRS : {}",
+ prsDefault,
message.getStr(CollectionStateProps.PER_REPLICA_STATE),
isPRS);
}
diff --git a/solr/core/src/java/org/apache/solr/core/ZkContainer.java
b/solr/core/src/java/org/apache/solr/core/ZkContainer.java
index 4077255f6a1..b5fdc3c5718 100644
--- a/solr/core/src/java/org/apache/solr/core/ZkContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/ZkContainer.java
@@ -63,17 +63,14 @@ public class ZkContainer {
private ExecutorService coreZkRegister =
ExecutorUtil.newMDCAwareCachedThreadPool(new
SolrNamedThreadFactory("coreZkRegister"));
- // see ZkController.zkRunOnly
- private boolean zkRunOnly = Boolean.getBoolean("zkRunOnly"); // expert
-
private SolrMetricProducer metricProducer;
public ZkContainer() {}
public void initZooKeeper(final CoreContainer cc, CloudConfig config) {
- String zkRun = System.getProperty("zkRun");
+ boolean zkRun =
EnvUtils.getPropertyAsBool("solr.zookeeper.server.enabled", false);
- if (zkRun != null && config == null)
+ if (zkRun && config == null)
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
"Cannot start Solr in cloud mode - no cloud config provided");
@@ -88,13 +85,15 @@ public class ZkContainer {
System.setProperty("zookeeper.jmx.log4j.disable", "true");
Path solrHome = cc.getSolrHome();
- if (zkRun != null) {
+ if (zkRun) {
String zkDataHome =
- System.getProperty("zkServerDataDir",
solrHome.resolve("zoo_data").toString());
- String zkConfHome = System.getProperty("zkServerConfDir",
solrHome.toString());
+ EnvUtils.getProperty(
+ "solr.zookeeper.server.datadir",
solrHome.resolve("zoo_data").toString());
+ String zkConfHome =
+ EnvUtils.getProperty("solr.zookeeper.server.confdir",
solrHome.toString());
zkServer =
new SolrZkServer(
- stripChroot(zkRun),
+ zkRun,
stripChroot(config.getZkHost()),
Path.of(zkDataHome),
zkConfHome,
@@ -115,7 +114,7 @@ public class ZkContainer {
// we are ZooKeeper enabled
try {
// If this is an ensemble, allow for a long connect time for other
servers to come up
- if (zkRun != null && zkServer.getServers().size() > 1) {
+ if (zkRun && zkServer.getServers().size() > 1) {
zkClientConnectTimeout = 24 * 60 * 60 * 1000; // 1 day for embedded
ensemble
log.info("Zookeeper client={} Waiting for a quorum.",
zookeeperHost);
} else {
@@ -123,7 +122,7 @@ public class ZkContainer {
}
boolean createRoot =
EnvUtils.getPropertyAsBool("solr.zookeeper.chroot.create", false);
- if (!ZkController.checkChrootPath(zookeeperHost, zkRunOnly ||
createRoot)) {
+ if (!ZkController.checkChrootPath(zookeeperHost, createRoot)) {
throw new ZooKeeperException(
SolrException.ErrorCode.SERVER_ERROR,
"A chroot was specified in ZkHost but the znode doesn't exist. "
+ zookeeperHost);
@@ -132,7 +131,7 @@ public class ZkContainer {
ZkController zkController =
new ZkController(cc, zookeeperHost, zkClientConnectTimeout,
config);
- if (zkRun != null) {
+ if (zkRun) {
if (StrUtils.isNotNullOrEmpty(System.getProperty(HTTPS_PORT_PROP))) {
// Embedded ZK and probably running with SSL
new ClusterProperties(zkController.getZkClient())
diff --git
a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
index 160effef95f..6624363bf40 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
@@ -55,6 +55,7 @@ import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.MetricsConfig;
import org.apache.solr.core.NodeConfig;
@@ -315,7 +316,8 @@ public class CoreContainerProvider implements
ServletContextListener {
}
/**
- * We are in cloud mode if Java option zkRun exists OR zkHost exists and is
non-empty
+ * We are in cloud mode if Java option solr.zookeeper.server.enabled exists
OR zkHost exists and
+ * is non-empty
*
* @see SolrXmlConfig#wrapAndSetZkHostFromSysPropIfNeeded
* @see #extraProperties
@@ -324,7 +326,7 @@ public class CoreContainerProvider implements
ServletContextListener {
private boolean isCloudMode() {
assert null != extraProperties; // we should never be called w/o this
being initialized
return (null != extraProperties.getProperty(SolrXmlConfig.ZK_HOST))
- || (null != System.getProperty("zkRun"));
+ || EnvUtils.getPropertyAsBool("solr.zookeeper.server.enabled", false);
}
/**
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index b6d4a1cb673..455f1987cf2 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -60,7 +60,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
index 038813e8dd3..89013486aaa 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
@@ -28,7 +28,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2">
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index d104e8d80af..b655c9355da 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -60,7 +60,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
index 50518e15d07..d29f7faa282 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
@@ -56,7 +56,7 @@
</query>
<updateHandler>
- <updateLog enable="${enable.update.log}">
+ <updateLog enable="${solr.index.updatelog.enabled}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
</updateHandler>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
index bdeedb6bcc0..abd50a7cbf0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
@@ -66,7 +66,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
index 662089c170a..4c5c76a4247 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml
@@ -28,7 +28,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2">
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index 63f2ce29b7e..c7e160d8980 100644
---
a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++
b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -59,7 +59,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 0e191aa3d41..30764a94377 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -66,7 +66,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
diff --git a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
index 8cc81184c40..a4ba1f26e68 100644
--- a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
+++ b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
@@ -39,7 +39,8 @@ public class TestCrossCoreJoin extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.filterCache.async", "true");
// initCore("solrconfig.xml","schema12.xml");
diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
index ae9db33525d..419c7b369be 100644
--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
@@ -69,7 +69,8 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {
// when doing unsorted group collection
systemSetPropertySolrTestsMergePolicyFactory(LogDocMergePolicyFactory.class.getName());
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java
b/solr/core/src/test/org/apache/solr/TestJoin.java
index c257f077918..9ac9e7b271f 100644
--- a/solr/core/src/test/org/apache/solr/TestJoin.java
+++ b/solr/core/src/test/org/apache/solr/TestJoin.java
@@ -40,7 +40,8 @@ public class TestJoin extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.filterCache.async", "true");
// all points change at the same time point fields need docvalues
diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
index 63cbe0ea8d9..3589a26187e 100644
--- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
+++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
@@ -53,7 +53,8 @@ public class TestRandomFaceting extends SolrTestCaseJ4 {
System.setProperty(NUMERIC_DOCVALUES_SYSPROP, "true");
}
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
index e080a4ddc7f..e5cefb2b231 100644
---
a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
+++
b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java
@@ -49,7 +49,7 @@ public class TestOnReconnectListenerSupport extends
AbstractFullDistribZkTestBas
@BeforeClass
public static void initSysProperties() {
System.setProperty("managed.schema.mutable", "false");
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
b/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
index 1040aaf7645..b992436c5f9 100644
--- a/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
@@ -28,11 +28,11 @@ public class TestBadConfig extends
AbstractBadConfigTestBase {
public void testUpdateLogButNoVersionField() throws Exception {
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
try {
assertConfigs("solrconfig.xml", "schema12.xml", "_version_");
} finally {
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
}
}
diff --git
a/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java
b/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java
index 857fde92e2a..9081c59ae31 100644
--- a/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java
+++ b/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java
@@ -24,7 +24,7 @@ public class TestReloadAndDeleteDocs extends SolrTestCaseJ4 {
@After
public void after() {
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
deleteCore();
}
@@ -37,7 +37,7 @@ public class TestReloadAndDeleteDocs extends SolrTestCaseJ4 {
}
private void doTest(final boolean useUpdateLog) throws Exception {
- System.setProperty("enable.update.log", useUpdateLog ? "true" : "false");
+ System.setProperty("solr.index.updatelog.enabled", useUpdateLog ? "true" :
"false");
initCore("solrconfig.xml", "schema.xml", TEST_HOME());
assertEquals(
"UpdateLog existence doesn't match sys prop (test config changed?)",
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index f9ff11a9ad8..cbadc2afdd9 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -122,7 +122,7 @@ public class TestSolrConfigHandler extends RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome,
diff --git a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
index e02ba5447dd..9f1f0beefb1 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
@@ -35,7 +35,8 @@ public class TestCSVLoader extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
index c3479340564..02d7066d215 100644
---
a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
@@ -33,7 +33,8 @@ public class LukeRequestHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
index 5a562eabe35..247459737e6 100644
---
a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java
@@ -51,7 +51,7 @@ public class SegmentsInfoRequestHandlerTest extends
SolrTestCaseJ4 {
System.setProperty("solr.tests.maxBufferedDocs", "1000");
System.setProperty("solr.tests.ramBufferSizeMB", "5000");
- System.setProperty("enable.update.log", "false"); // no _version_ in our
schema
+ System.setProperty("solr.index.updatelog.enabled", "false"); // no
_version_ in our schema
// segments API shouldn't depend on _version_ or ulog
initCore("solrconfig.xml", "schema12.xml");
diff --git
a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
index 967313b4a34..2870fb222bb 100644
---
a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java
@@ -36,7 +36,8 @@ public class TermsComponentTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTest() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
index c85b1ce6a48..2bf3cd38852 100644
--- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
+++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
@@ -44,7 +44,7 @@ public class TestStreamBody extends RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome, "solrconfig-minimal.xml", "schema-rest.xml", "/solr",
true, extraServlets);
diff --git a/solr/core/src/test/org/apache/solr/response/DocsStreamerTest.java
b/solr/core/src/test/org/apache/solr/response/DocsStreamerTest.java
index fa7c9695b16..b21af51fe46 100644
--- a/solr/core/src/test/org/apache/solr/response/DocsStreamerTest.java
+++ b/solr/core/src/test/org/apache/solr/response/DocsStreamerTest.java
@@ -27,7 +27,8 @@ public class DocsStreamerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
index 3c5afeb2085..b38b5ca4474 100644
--- a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
@@ -32,7 +32,8 @@ import org.junit.Test;
public class TestCSVResponseWriter extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
createIndex();
}
diff --git
a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
index a74f2012157..fafe27591d7 100644
--- a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java
@@ -39,7 +39,8 @@ import org.junit.Test;
public class TestGraphMLResponseWriter extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java
b/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java
index 0b46ddfed13..e5becc61dc2 100644
--- a/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestJavaBinResponseWriter.java
@@ -44,7 +44,8 @@ public class TestJavaBinResponseWriter extends SolrTestCaseJ4
{
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
index 9550528f810..5de81116cb2 100644
---
a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
+++
b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
@@ -66,7 +66,7 @@ public class TestRetrieveFieldsOptimizer extends
SolrTestCaseJ4 {
System.setProperty("managed.schema.mutable", "true");
System.setProperty(
"managed.schema.resourceName",
"schema-one-field-no-dynamic-field-unique-key.xml");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-managed-schema.xml", "ignoredSchemaName");
diff --git
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
index 072ac509853..b325b6f959e 100644
---
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
+++
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformer.java
@@ -46,7 +46,7 @@ public class TestSubQueryTransformer extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-basic.xml", "schema-docValuesJoin.xml");
peopleMultiplier = atLeast(1);
deptMultiplier = atLeast(1);
diff --git
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerCrossCore.java
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerCrossCore.java
index b8fffc2b445..b40d752f72f 100644
---
a/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerCrossCore.java
+++
b/solr/core/src/test/org/apache/solr/response/transform/TestSubQueryTransformerCrossCore.java
@@ -33,7 +33,8 @@ public class TestSubQueryTransformerCrossCore extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig-basic.xml", "schema-docValuesJoin.xml");
final CoreContainer coreContainer = h.getCoreContainer();
diff --git
a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
index 446665aa236..d6357a6cf16 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
@@ -62,7 +62,7 @@ public class TestBulkSchemaAPI extends RestTestBase {
PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome);
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml",
"/solr", true, null);
diff --git
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
index 5d5293b62f9..f98a49f3f28 100644
---
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
+++
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
@@ -48,7 +48,7 @@ public class TestManagedStopFilterFactory extends
RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome,
@@ -63,7 +63,7 @@ public class TestManagedStopFilterFactory extends
RestTestBase {
public void after() throws Exception {
solrClientTestRule.reset();
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
if (restTestHarness != null) {
restTestHarness.close();
diff --git
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
index 0609dc7749c..8b767a6e416 100644
---
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
+++
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
@@ -47,7 +47,7 @@ public class TestManagedSynonymFilterFactory extends
RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome,
"solrconfig-managed-schema.xml",
@@ -65,7 +65,7 @@ public class TestManagedSynonymFilterFactory extends
RestTestBase {
tmpSolrHome = null;
}
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
if (restTestHarness != null) {
restTestHarness.close();
diff --git
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
index 249b62e86e8..1c5cd9eac34 100644
---
a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
+++
b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
@@ -50,7 +50,7 @@ public class TestManagedSynonymGraphFilterFactory extends
RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome,
"solrconfig-managed-schema.xml",
@@ -67,7 +67,7 @@ public class TestManagedSynonymGraphFilterFactory extends
RestTestBase {
PathUtils.deleteDirectory(tmpSolrHome);
}
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
if (restTestHarness != null) {
restTestHarness.close();
diff --git
a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
index 4b753398521..7173bffbb9b 100644
--- a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java
@@ -604,7 +604,7 @@ public class DenseVectorFieldTest extends
AbstractBadConfigTestBase {
public void denseVectorField_shouldBePresentAfterAtomicUpdate() throws
Exception {
assumeTrue(
"update log must be enabled for atomic update",
- Boolean.getBoolean(System.getProperty("enable.update.log")));
+
Boolean.getBoolean(System.getProperty("solr.index.updatelog.enabled")));
try {
initCore("solrconfig.xml", "schema-densevector.xml");
SolrInputDocument doc = new SolrInputDocument();
@@ -643,7 +643,7 @@ public class DenseVectorFieldTest extends
AbstractBadConfigTestBase {
public void denseVectorFieldOnAtomicUpdate_shouldBeUpdatedCorrectly() throws
Exception {
assumeTrue(
"update log must be enabled for atomic update",
- Boolean.getBoolean(System.getProperty("enable.update.log")));
+
Boolean.getBoolean(System.getProperty("solr.index.updatelog.enabled")));
try {
initCore("solrconfig.xml", "schema-densevector.xml");
SolrInputDocument doc = new SolrInputDocument();
diff --git
a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
index ee514700854..dcd960d2e09 100644
--- a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
@@ -30,7 +30,8 @@ public class NotRequiredUniqueKeyTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // use case doesn't work
with updateLog
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // use case doesn't work
with updateLog
initCore("solrconfig.xml", "schema-not-required-unique-key.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
index c0097e79190..5b681d4c9fc 100644
--- a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
@@ -36,7 +36,8 @@ public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 {
public void setUp() throws Exception {
super.setUp();
// set some system properties for use by tests
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
diff --git
a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
index 6de03f515eb..3d3c84d6cda 100644
--- a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java
@@ -58,7 +58,7 @@ public class SpatialRPTFieldTypeTest extends
AbstractBadConfigTestBase {
// initCore will trigger an upgrade to managed schema, since the
solrconfig has
// <schemaFactory class="ManagedIndexSchemaFactory" ... />
System.setProperty("managed.schema.mutable", "false");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-managed-schema.xml", "schema-minimal.xml",
tmpSolrHome);
}
@@ -66,7 +66,7 @@ public class SpatialRPTFieldTypeTest extends
AbstractBadConfigTestBase {
public void afterClass() {
deleteCore();
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
}
static final String INDEXED_COORDINATES = "25,82";
diff --git
a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
index ccff799d889..b709b36bbee 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
@@ -55,7 +55,7 @@ public class TestBulkSchemaConcurrent extends
AbstractFullDistribZkTestBase {
@BeforeClass
public static void initSysProperties() {
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
}
@Override
diff --git
a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
index e758b7326f1..1e5c69846fe 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java
@@ -44,7 +44,7 @@ public class TestCloudManagedSchema extends
AbstractFullDistribZkTestBase {
@BeforeClass
public static void initSysProperties() {
System.setProperty("managed.schema.mutable", "false");
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
index 9d16da317e7..2bb9aa3b95b 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
@@ -80,7 +80,7 @@ public class TestManagedSchema extends
AbstractBadConfigTestBase {
// initCore will trigger an upgrade to managed schema, since the
solrconfig has
// <schemaFactory class="ManagedIndexSchemaFactory" ... />
System.setProperty("managed.schema.mutable", "false");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-managed-schema.xml", "schema-minimal.xml",
tmpSolrHome);
}
@@ -88,7 +88,7 @@ public class TestManagedSchema extends
AbstractBadConfigTestBase {
public void afterClass() {
deleteCore();
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
}
public void testUpgrade() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index f92fbe71e03..cbee971c7cc 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -642,7 +642,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testIntPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
doTestIntPointFieldsAtomicUpdates("number_p_i");
@@ -652,7 +652,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testMultiValuedIntPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
String[] ints = toStringArray(getRandomInts(3, false));
@@ -1284,7 +1284,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testDoublePointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
doTestDoublePointFieldsAtomicUpdates("number_p_d");
@@ -1294,7 +1294,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testMultiValuedDoublePointFieldsAtomicUpdates() throws Exception
{
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
String[] doubles = toStringArray(getRandomDoubles(3, false));
@@ -1900,7 +1900,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testFloatPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
doTestFloatPointFieldsAtomicUpdates("number_p_f");
@@ -1910,7 +1910,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testMultiValuedFloatPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
String[] floats = toStringArray(getRandomFloats(3, false));
@@ -2463,7 +2463,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testLongPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
doTestLongPointFieldsAtomicUpdates("number_p_l");
@@ -2473,7 +2473,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testMultiValuedLongPointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
String[] longs = toStringArray(getRandomLongs(3, false));
@@ -3096,7 +3096,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testDatePointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
doTestDatePointFieldsAtomicUpdates("number_p_dt");
@@ -3106,7 +3106,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
@Test
public void testMultiValuedDatePointFieldsAtomicUpdates() throws Exception {
- if (!Boolean.getBoolean("enable.update.log")) {
+ if (!Boolean.getBoolean("solr.index.updatelog.enabled")) {
return;
}
String[] dates =
@@ -3430,7 +3430,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
assertU(adoc("id", String.valueOf(i), field, values[i]));
}
// Check using RTG
- if (Boolean.getBoolean("enable.update.log")) {
+ if (Boolean.getBoolean("solr.index.updatelog.enabled")) {
for (int i = 0; i < values.length; i++) {
assertQ(
req("qt", "/get", "id", String.valueOf(i)),
@@ -3455,7 +3455,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
assertQ(req("q", "*:*", "fl", "id, " + field, "rows",
String.valueOf(values.length)), expected);
// Check using RTG
- if (Boolean.getBoolean("enable.update.log")) {
+ if (Boolean.getBoolean("solr.index.updatelog.enabled")) {
for (int i = 0; i < values.length; i++) {
assertQ(
req("qt", "/get", "id", String.valueOf(i)),
@@ -4077,7 +4077,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
assertU(adoc("id", String.valueOf(i), fieldName, numbers[i], fieldName,
numbers[i + 10]));
}
// Check using RTG before commit
- if (Boolean.getBoolean("enable.update.log")) {
+ if (Boolean.getBoolean("solr.index.updatelog.enabled")) {
for (int i = 0; i < 10; i++) {
assertQ(
req("qt", "/get", "id", String.valueOf(i)),
@@ -4088,7 +4088,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
}
// Check using RTG after commit
assertU(commit());
- if (Boolean.getBoolean("enable.update.log")) {
+ if (Boolean.getBoolean("solr.index.updatelog.enabled")) {
for (int i = 0; i < 10; i++) {
assertQ(
req("qt", "/get", "id", String.valueOf(i)),
diff --git
a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
index 2b29b00c552..59c40f16edc 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
@@ -111,7 +111,7 @@ public class TestUseDocValuesAsStored extends
AbstractBadConfigTestBase {
// initCore will trigger an upgrade to managed schema, since the
solrconfig has
// <schemaFactory class="ManagedIndexSchemaFactory" ... />
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
System.setProperty("managed.schema.mutable", "true");
initCore("solrconfig-managed-schema.xml",
"schema-non-stored-docvalues.xml", tmpSolrHome);
@@ -123,7 +123,7 @@ public class TestUseDocValuesAsStored extends
AbstractBadConfigTestBase {
clearIndex();
deleteCore();
System.clearProperty("managed.schema.mutable");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
}
public String getCoreName() {
diff --git
a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
index 748ae316cd1..ab6e9178287 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java
@@ -37,7 +37,7 @@ public class TestUseDocValuesAsStored2 extends RestTestBase {
PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome);
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml",
"/solr", true, null);
diff --git a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
index ba5d2d339cd..ffb5a0708d3 100644
--- a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java
@@ -43,7 +43,7 @@ public class LargeFieldTest extends SolrTestCaseJ4 {
System.setProperty("managed.schema.mutable", "true");
System.setProperty(
"managed.schema.resourceName",
"schema-one-field-no-dynamic-field-unique-key.xml");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
System.setProperty("documentCache.enabled", "true");
System.setProperty("enableLazyFieldLoading", "true");
diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
index 20cda788f33..856092c151c 100644
--- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
+++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
@@ -42,7 +42,8 @@ public class ReturnFieldsTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
String v = "how now brown cow";
assertU(adoc("id", "1", "new_id_s", "10", "text", v, "text_np", v,
"#foo_s", v));
diff --git
a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
index 755d9eb7691..f7ac2b40616 100644
--- a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
@@ -46,7 +46,7 @@ public class TestAddFieldRealTimeGet extends TestRTGBase {
// initCore will trigger an upgrade to managed schema, since the
solrconfig has
// <schemaFactory class="ManagedIndexSchemaFactory" ... />
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore(configFileName, schemaFileName, tmpSolrHome);
}
diff --git
a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 21e3f30b654..ed85c7bbf62 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -60,7 +60,8 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
index();
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index e92cc11beea..66e4a990931 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -38,7 +38,8 @@ public class TestFiltering extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema_latest.xml");
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestInitQParser.java
b/solr/core/src/test/org/apache/solr/search/TestInitQParser.java
index 9073d526a52..74b92400ac8 100644
--- a/solr/core/src/test/org/apache/solr/search/TestInitQParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestInitQParser.java
@@ -46,7 +46,8 @@ public class TestInitQParser extends SolrTestCaseJ4 {
@Before
public void setUp() throws Exception {
super.setUp();
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig-query-parser-init.xml", "schema12.xml");
createIndex();
}
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 96d06362f72..0eef541f39f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -64,7 +64,8 @@ import org.junit.Test;
public class TestSolrQueryParser extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.max.booleanClauses", "42"); // lower for testing
System.setProperty("solr.filterCache.async", "true"); // for
testLocalParamsInQP
initCore("solrconfig.xml", "schema12.xml");
diff --git
a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
index ceb27a4ed44..feed0e9af06 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
@@ -51,7 +51,8 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.filterCache.async", "true");
initCore("solrconfig-basic.xml", "schema-docValuesJoin.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
index fc47534bc13..e3433329d06 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java
@@ -45,7 +45,8 @@ public class TestScoreJoinQPScore extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
System.setProperty("solr.filterCache.async", "true");
initCore("solrconfig.xml", "schema12.xml");
}
diff --git a/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java
b/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java
index c796c8356de..de20b5a728f 100644
--- a/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java
+++ b/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java
@@ -80,7 +80,7 @@ public class CustomTLogDirTest extends SolrTestCaseJ4 {
Path ulogDir = Path.of("../");
Path configSet = LuceneTestCase.createTempDir();
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
System.setProperty("solr.test.sys.prop2", "proptwo");
System.setProperty("solr.ulog.dir", ulogDir.toString()); // picked up from
`solrconfig.xml`
SolrTestCaseJ4.copyMinConf(configSet, null, "solrconfig.xml");
@@ -144,7 +144,7 @@ public class CustomTLogDirTest extends SolrTestCaseJ4 {
private static void validateTlogPath(
SolrClient client, Path instanceDir, Path ulogDir, Path resolvedTlogDir)
throws Exception {
Path configSet = LuceneTestCase.createTempDir();
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
System.setProperty("solr.test.sys.prop2", "proptwo");
if (ulogDir != null) {
System.setProperty("solr.ulog.dir", ulogDir.toString()); // picked up
from `solrconfig.xml`
diff --git
a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java
b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java
index d73d73d73a6..9e302b03f99 100644
--- a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java
@@ -42,7 +42,7 @@ public class DataDrivenBlockJoinTest extends SolrTestCaseJ4 {
testHomeConfDir.resolve("solrconfig.snippet.randomindexconfig.xml"),
tmpConfDir);
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore(
"solrconfig-schemaless.xml",
"schema-add-schema-fields-update-processor.xml", tmpSolrHome);
}
diff --git
a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
index 0d30bb0f198..542f105cb78 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
@@ -58,7 +58,8 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
public static void beforeClass() throws Exception {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory",
"org.apache.solr.core.MockFSDirectoryFactory");
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
systemSetPropertySolrTestsMergePolicyFactory(TieredMergePolicyFactory.class.getName());
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerWithUpdateLogTest.java
b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerWithUpdateLogTest.java
index 3115614e0c4..1546b7eb9b2 100644
---
a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerWithUpdateLogTest.java
+++
b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerWithUpdateLogTest.java
@@ -35,7 +35,7 @@ public class DirectUpdateHandlerWithUpdateLogTest extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("solr.updateHandler",
SpyingUpdateHandler.class.getName());
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore("solrconfig.xml", "schema11.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
index 6650dc40414..678b115fa77 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
@@ -51,7 +51,8 @@ public class SolrIndexSplitterTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- // System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ // System.setProperty("solr.index.updatelog.enabled", "false"); //
schema12 doesn't support
+ // _version_
System.setProperty("solr.directoryFactory",
"solr.NRTCachingDirectoryFactory");
System.setProperty("solr.tests.lockType",
DirectoryFactory.LOCK_TYPE_SIMPLE);
diff --git
a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java
b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java
index f24899f5765..fc53b7cc265 100644
--- a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java
+++ b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java
@@ -23,7 +23,7 @@ public class TestAtomicUpdateErrorCases extends
SolrTestCaseJ4 {
public void testUpdateNoTLog() throws Exception {
try {
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig.xml", "schema15.xml");
UpdateHandler uh = h.getCore().getUpdateHandler();
@@ -48,7 +48,7 @@ public class TestAtomicUpdateErrorCases extends
SolrTestCaseJ4 {
assertTrue(ex.getMessage().contains("unless <updateLog/> is
configured"));
resetExceptionIgnores();
} finally {
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
deleteCore();
}
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
index 80240570045..208ff853948 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/AbstractAtomicUpdatesMultivalueTestBase.java
@@ -47,7 +47,7 @@ public abstract class AbstractAtomicUpdatesMultivalueTestBase
extends EmbeddedSo
throws Exception {
solrClientTestRule.startSolr(SolrTestCaseJ4.TEST_HOME());
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
SolrTestCaseJ4.newRandomConfig();
System.setProperty("solr.test.sys.prop1", "propone"); // TODO yuck; remove
System.setProperty("solr.test.sys.prop2", "proptwo"); // TODO yuck; remove
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJsonTest.java
b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJsonTest.java
index 699e01c7c75..b8e57d7513e 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJsonTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateJsonTest.java
@@ -31,7 +31,7 @@ public class AtomicUpdateJsonTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore("solrconfig.xml", "atomic-update-json-test.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java
b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java
index 86749dac8a8..c464bd4c561 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdateProcessorFactoryTest.java
@@ -36,7 +36,7 @@ public class AtomicUpdateProcessorFactoryTest extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore("solrconfig.xml", "schema.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index 96813d95344..b953203ca7a 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -42,7 +42,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTests() throws Exception {
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore("solrconfig.xml", "schema.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
index d884f0168f6..40923197cdc 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java
@@ -46,7 +46,7 @@ public class ClassificationUpdateProcessorIntegrationTest
extends SolrTestCaseJ4
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-classification.xml", "schema-classification.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index 3e4cbeee234..9ae440525fa 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -58,7 +58,7 @@ public class ClassificationUpdateProcessorTest extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
assumeWorkingMockito();
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig-classification.xml", "schema-classification.xml");
}
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
index 0014260001a..e5bf79c4c41 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java
@@ -50,7 +50,7 @@ public class DistributedUpdateProcessorTest extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
executor = ExecutorUtil.newMDCAwareCachedThreadPool(getClassName());
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
initCore(
"solr/collection1/conf/solrconfig.xml",
"solr/collection1/conf/schema-minimal-with-another-uniqkey.xml");
@@ -59,7 +59,7 @@ public class DistributedUpdateProcessorTest extends
SolrTestCaseJ4 {
@AfterClass
public static void afterClass() {
ExecutorUtil.shutdownAndAwaitTermination(executor);
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
}
@Test
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java
b/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java
index a6d90e339c3..6c69ed96635 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java
@@ -39,7 +39,8 @@ public class RegexBoostProcessorTest extends SolrTestCaseJ4 {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
SolrCore core = h.getCore();
_parser = new SolrRequestParsers(null);
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
index fe76fe0760d..dce2f9e9ffd 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java
@@ -38,7 +38,8 @@ public class UniqFieldsUpdateProcessorFactoryTest extends
SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false"); // schema12 doesn't
support _version_
+ System.setProperty(
+ "solr.index.updatelog.enabled", "false"); // schema12 doesn't support
_version_
initCore("solrconfig.xml", "schema12.xml");
}
diff --git
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
index 8de926364d0..6ada20a5271 100644
---
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
+++
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
index e8f7a856b6a..b5570c473ef 100644
---
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
+++
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
index 446ab731edc..edc03b2a0c9 100644
---
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
+++
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
index 1def09ff542..6d6b7fb4e7c 100644
---
a/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
+++
b/solr/cross-dc-manager/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git a/solr/docker/templates/Dockerfile.body.template
b/solr/docker/templates/Dockerfile.body.template
index 777d051ca19..c6714ecfa62 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -46,7 +46,7 @@ ENV SOLR_USER="solr" \
SOLR_LOGS_DIR=/var/solr/logs \
LOG4J_PROPS=/var/solr/log4j2.xml \
SOLR_JETTY_HOST="0.0.0.0" \
- SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
+ SOLR_ZOOKEEPER_EMBEDDED_HOST="0.0.0.0"
RUN set -ex; \
groupadd -r --gid "$SOLR_GID" "$SOLR_GROUP"; \
diff --git
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
index 8de926364d0..6ada20a5271 100644
---
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
+++
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig-producerdisabled.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
index e8f7a856b6a..b5570c473ef 100644
---
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
+++
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal-no-dbq/conf/solrconfig.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
index 446ab731edc..edc03b2a0c9 100644
---
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
+++
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig-producerdisabled.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
index 1def09ff542..6d6b7fb4e7c 100644
---
a/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
+++
b/solr/modules/cross-dc/src/test-files/configs/cloud-minimal/conf/solrconfig.xml
@@ -68,7 +68,7 @@
<autoCommit>
<maxTime>${autoCommit.maxTime:60000}</maxTime>
</autoCommit>
- <updateLog class="${ulog:solr.UpdateLog}"
enable="${enable.update.log:true}"/>
+ <updateLog class="${ulog:solr.UpdateLog}"
enable="${solr.index.updatelog.enabled:true}"/>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
diff --git
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
index a19ba976591..42e9825ad7c 100644
---
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
+++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
@@ -46,7 +46,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
initCore("solrconfig.xml", "schema.xml",
getFile("extraction/solr").toAbsolutePath());
createIndex();
// find a reference to the default response writer so we can redirect its
output later
diff --git
a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
index afc148e5125..f509ea1185c 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
@@ -51,7 +51,7 @@ public class TestLTROnSolrCloud extends TestRerankBase {
public void setUp() throws Exception {
super.setUp();
setupTestInit(solrconfig, schema, true);
- System.setProperty("enable.update.log", "true");
+ System.setProperty("solr.index.updatelog.enabled", "true");
int numberOfShards = random().nextInt(4) + 1;
int numberOfReplicas = random().nextInt(2) + 1;
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 4ef87e35892..e3b30b24043 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -175,7 +175,7 @@ public class TestRerankBase extends RestTestBase {
public static void setuptest(String solrconfig, String schema) throws
Exception {
setupTestInit(solrconfig, schema, false);
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(tmpSolrHome, solrconfig, schema, "/solr", true,
null);
}
@@ -198,7 +198,7 @@ public class TestRerankBase extends RestTestBase {
tmpSolrHome = null;
}
System.clearProperty("managed.schema.mutable");
- // System.clearProperty("enable.update.log");
+ // System.clearProperty("solr.index.updatelog.enabled");
unchooseDefaultFeatureFormat();
}
diff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfg
index 621506c616d..828bb893100 100644
--- a/solr/server/solr/zoo.cfg
+++ b/solr/server/solr/zoo.cfg
@@ -13,7 +13,7 @@ syncLimit=5
# the port at which the clients will connect
# clientPort=2181
-# NOTE: Solr sets this based on zkRun / zkHost params
+# NOTE: Solr sets this based on solr.zookeeper.server.enabled / zkHost params
# the maximum number of client connections.
# increase this if you need to handle more clients
diff --git
a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
index dffa293239c..1b1225b57f1 100644
---
a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
+++
b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc
@@ -74,7 +74,7 @@ The default `solr.xml` file is found in
`$SOLR_TIP/server/solr/solr.xml` and loo
As you can see, the discovery Solr configuration is "SolrCloud friendly".
However, the presence of the `<solrcloud>` element does _not_ mean that the
Solr instance is running in SolrCloud mode.
-Unless the `-DzkHost` or `-DzkRun` are specified at startup time, this section
is ignored.
+Unless the `-DzkHost` or `-Dsolr.zookeeper.server.enabled=true` are specified
at startup time, this section is ignored.
== Solr.xml Parameters
@@ -367,7 +367,7 @@ By default, Solr will hide all basicAuth, AWS, ZK or SSL
secret sysProps. It wil
=== The <solrcloud> Element
This element defines several parameters that relate so SolrCloud.
-This section is ignored unless the Solr instance is started with either
`-DzkRun` or `-DzkHost`
+This section is ignored unless the Solr instance is started with either
`-Dsolr.zookeeper.server.enabled=TRUE` or `-DzkHost`
`distribUpdateConnTimeout`::
+
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.adoc
index 6e150e61155..aaf9e9f3c56 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
@@ -58,7 +58,7 @@ NOTE: Properties marked with "!" indicate inverted meaning
between old and new p
|solr.index.replication.fingerprint.enabled|!solr.disableFingerprint|true|Controls
whether index fingerprinting for replication is disabled.
-|solr.index.updatelog.enabled|enable.update.log|true (in default
solrconfig.xml)|Controls whether the UpdateLog is enabled. The UpdateLog is
required for atomic updates, real-time get, and transaction log replay.
+|solr.index.updatelog.enabled|enable.update.log|true (in default
solrconfig.xml)|Controls whether the UpdateLog is enabled. The UpdateLog is
required for atomic updates, real-time get, and transaction log replay. May be
disabled in testing environments or with schemas that don't support versioning
(older schemas) to improve performance at the cost of data durability.
|solr.logs.dir|solr.log.dir|server/logs|Specifies the directory where Solr
logs are stored.
@@ -95,6 +95,15 @@ NOTE: Properties marked with "!" indicate inverted meaning
between old and new p
|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.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.
+
+|solr.zookeeper.server.confdir|zkServerConfDir|Defaults to solr.home
dir.|Where to store ZooKeeper configuration when running embedded ZooKeeper.
+
+|solr.zookeeper.server.datadir|zkServerDataDir|Defaults to solr.home/zoo_data
dir.|Where to store ZooKeeper data when running embedded ZooKeeper.
+
+|solr.zookeeper.server.enabled|zk.run|false|Controls whether embedded
ZooKeeper is started. Set by the start script.
+
|===
== Property Naming Conventions
diff --git
a/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
index f29d50f8d0a..5add3630aa3 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/securing-solr.adoc
@@ -118,11 +118,11 @@ The same setting is also available as the
`-Dsolr.jetty.host` System Property.
The same is true for the embedded Zookeeper, if it is run with Solr.
By default, the embedded Zookeeper only listens on the loopback interface
("127.0.0.1")
-The bind host is controlled via the `SOLR_ZK_EMBEDDED_HOST` value in your
environment's "include script" (`solr.in.sh` or `solr.in.cmd`):
+The bind host is controlled via the `SOLR_ZOOKEEPER_EMBEDDED_HOST` value in
your environment's "include script" (`solr.in.sh` or `solr.in.cmd`):
[source,bash]
----
- SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
+ SOLR_ZOOKEEPER_EMBEDDED_HOST="0.0.0.0"
----
The same setting is also available as the `-Dsolr.zk.embedded.host` System
Property.
diff --git
a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc
b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc
index 2bec545b3c8..d6047e152e8 100644
--- a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc
+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc
@@ -194,7 +194,7 @@ $ cd $SOLR_HOME
# uncomment and edit the two variables
# vim bin/solr.in.sh
SOLR_JETTY_HOST="0.0.0.0"
-SOLR_ZK_EMBEDDED_HOST="0.0.0.0"
+SOLR_ZOOKEEPER_EMBEDDED_HOST="0.0.0.0"
----
+
See xref:deployment-guide:securing-solr.adoc#network-configuration[Network
Configuration] for more details.
diff --git
a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
index 517b66676c1..6b8b4d697ae 100644
--- a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
+++ b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
@@ -15,6 +15,7 @@
solr.auth.jwt.outbound.http.enabled=solr.auth.jwt.allow.outbound.http
solr.auth.superuser=solr.authorization.superuser
solr.cloud.prep.recovery.read.timeout.additional.ms=prep.recovery.read.timeout.extra.wait
+solr.cloud.prs.enabled=solr.prs.default
solr.cloud.startup.delete.unknown.cores.enabled=solr.delete.unknown.cores
solr.cloud.wait.for.zk.seconds=solr.wait.for.zk
@@ -27,6 +28,7 @@ solr.configset.upload.enabled=configset.upload.enabled
solr.filestore.filesize.max=max.file.store.size
solr.index.replication.fingerprint.enabled=!solr.disableFingerprint
+solr.index.updatelog.enabled=enable.update.log
solr.logs.dir=solr.log.dir
@@ -55,3 +57,7 @@ solr.ui.enabled=!solr.admin.ui.disabled
solr.ui.experimental.enabled=!solr.admin.ui.experimental.disabled
solr.zookeeper.chroot.create=create.zk.chroot
+solr.zookeeper.server.confdir=zk.server.conf.dir
+solr.zookeeper.server.datadir=zk.server.data.dir
+solr.zookeeper.server.enabled=zk.run
+solr.zookeeper.embedded.host=solr.zk.embedded.host
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
index f234b7568a9..5c4dc5c6b5a 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
@@ -13,7 +13,7 @@ syncLimit=5
# the port at which the clients will connect
# clientPort=2181
-# NOTE: Solr sets this based on zkRun / zkHost params
+# NOTE: Solr sets this based on solr.zookeeper.server.enabled / zkHost params
# Disable ZK AdminServer since we do not use it
admin.enableServer=false
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index c5e1b53a533..d029c54605c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -104,7 +104,7 @@ public class SchemaTest extends RestTestBase {
final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "false");
+ System.setProperty("solr.index.updatelog.enabled", "false");
createJettyAndHarness(
tmpSolrHome, "solrconfig-managed-schema.xml", "schema.xml", "/solr",
true, extraServlets);
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index a8f1c7004e3..bb06061a73c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -274,7 +274,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
System.setProperty("zookeeper.forceSync", "no");
System.setProperty("jetty.testMode", "true");
- System.setProperty("enable.update.log", Boolean.toString(usually()));
+ System.setProperty("solr.index.updatelog.enabled",
Boolean.toString(usually()));
System.setProperty("tests.shardhandler.randomSeed",
Long.toString(random().nextLong()));
System.setProperty("solr.clustering.enabled", "false");
System.setProperty("solr.cloud.wait-for-updates-with-stale-state-pause",
"500");
@@ -323,7 +323,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
System.clearProperty("zookeeper.forceSync");
System.clearProperty("jetty.testMode");
System.clearProperty("tests.shardhandler.randomSeed");
- System.clearProperty("enable.update.log");
+ System.clearProperty("solr.index.updatelog.enabled");
System.clearProperty("useCompoundFile");
System.clearProperty(URL_SCHEME);
System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
index c223ba55c98..ef1760592c7 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractDistribZkTestBase extends
BaseDistributedSearchTestCase {
private static final String REMOVE_VERSION_FIELD = "remove.version.field";
- private static final String ENABLE_UPDATE_LOG = "enable.update.log";
+ private static final String ENABLE_UPDATE_LOG =
"solr.index.updatelog.enabled";
private static final String ZK_HOST = "zkHost";
private static final String ZOOKEEPER_FORCE_SYNC = "zookeeper.forceSync";
protected static final String DEFAULT_COLLECTION = "collection1";
diff --git
a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
index f50b7fb7b6a..4338f0cf40a 100644
--- a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -66,7 +66,7 @@
</autoCommit>
-->
- <updateLog enable="${enable.update.log:true}">
+ <updateLog enable="${solr.index.updatelog.enabled:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
