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 88591eda696 SOLR-6953: Remove back compat feature genericCoreNodeNames
(#3907)
88591eda696 is described below
commit 88591eda69601ed9427a530a4dd0fbe71c74c088
Author: Eric Pugh <[email protected]>
AuthorDate: Sun Nov 30 17:06:21 2025 -0500
SOLR-6953: Remove back compat feature genericCoreNodeNames (#3907)
---
changelog/unreleased/SOLR-6953.yml | 8 ++++++++
solr/benchmark/src/resources/solr.xml | 1 -
.../core/src/java/org/apache/solr/cloud/ZkController.java | 8 ++------
solr/core/src/java/org/apache/solr/core/CloudConfig.java | 15 ---------------
.../core/src/java/org/apache/solr/core/SolrXmlConfig.java | 3 ---
solr/core/src/test-files/solr/solr-jmxreporter.xml | 1 -
.../src/test-files/solr/solr-trackingshardhandler.xml | 1 -
solr/core/src/test-files/solr/solr.xml | 1 -
.../org/apache/solr/cloud/ClusterStateUpdateTest.java | 1 -
.../apache/solr/cloud/CreateCollectionCleanupTest.java | 1 -
.../collections/LocalFSCloudIncrementalBackupTest.java | 1 -
solr/core/src/test/org/apache/solr/core/TestSolrXml.java | 6 +++---
solr/modules/cross-dc/src/test-files/mirroring-solr.xml | 1 -
solr/modules/cuvs/src/test-files/solr/solr.xml | 1 -
.../org/apache/solr/gcs/GCSIncrementalBackupTest.java | 1 -
solr/modules/llm/src/test-files/solr/solr.xml | 1 -
solr/modules/ltr/src/test-files/solr/solr.xml | 1 -
solr/modules/opentelemetry/src/test-files/solr/solr.xml | 1 -
.../test/org/apache/solr/s3/S3IncrementalBackupTest.java | 1 -
solr/server/solr/solr.xml | 2 --
.../configuration-guide/pages/configuring-solr-xml.adoc | 12 ------------
solr/solrj-streaming/src/test-files/solrj/solr/solr.xml | 1 -
solr/solrj/src/test-files/solrj/solr/shared/solr.xml | 1 -
solr/solrj/src/test-files/solrj/solr/solr.xml | 1 -
.../apache/solr/cloud/AbstractFullDistribZkTestBase.java | 1 -
.../java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 1 -
.../cloud/api/collections/AbstractInstallShardTest.java | 1 -
27 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/changelog/unreleased/SOLR-6953.yml
b/changelog/unreleased/SOLR-6953.yml
new file mode 100644
index 00000000000..3cf1c8b4051
--- /dev/null
+++ b/changelog/unreleased/SOLR-6953.yml
@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Remove back compat feature genericCoreNodeNames for Solr Cloud node
naming.
+type: removed # added, changed, fixed, deprecated, removed, dependency_update,
security, other
+authors:
+ - name: Eric Pugh
+links:
+ - name: SOLR-6953
+ url: https://issues.apache.org/jira/browse/SOLR-6953
diff --git a/solr/benchmark/src/resources/solr.xml
b/solr/benchmark/src/resources/solr.xml
index 5f7c24d6634..38c9a776f53 100644
--- a/solr/benchmark/src/resources/solr.xml
+++ b/solr/benchmark/src/resources/solr.xml
@@ -37,7 +37,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:60000}</int>
<!-- This should be high by default - dc's are expensive -->
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:15000}</int> <!-- We are
running tests - the default should be low, not like production -->
<int
name="leaderConflictResolveWait">${leaderConflictResolveWait:45000}</int>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:5000}</int>
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 d57c5cb1d99..f8551e6fb3c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -243,8 +243,6 @@ public class ZkController implements Closeable {
private int leaderVoteWait;
private int leaderConflictResolveWait;
- private boolean genericCoreNodeNames;
-
private int clientTimeout;
private volatile boolean isClosed;
@@ -299,8 +297,6 @@ public class ZkController implements Closeable {
this.cloudConfig = cloudConfig;
- this.genericCoreNodeNames = cloudConfig.getGenericCoreNodeNames();
-
this.zkServerAddress = zkServerAddress;
this.localHostPort = cloudConfig.getSolrHostPort();
this.hostName = normalizeHostName(cloudConfig.getHost());
@@ -2097,8 +2093,8 @@ public class ZkController implements Closeable {
public String getCoreNodeName(CoreDescriptor descriptor) {
String coreNodeName = descriptor.getCloudDescriptor().getCoreNodeName();
- if (coreNodeName == null && !genericCoreNodeNames) {
- // it's the default
+ if (coreNodeName == null) {
+ // default core naming pattern
return getNodeName() + "_" + descriptor.getName();
}
diff --git a/solr/core/src/java/org/apache/solr/core/CloudConfig.java
b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
index e73bc029e1f..37e0bc3225e 100644
--- a/solr/core/src/java/org/apache/solr/core/CloudConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
@@ -29,8 +29,6 @@ public class CloudConfig {
private final String hostName;
- private final boolean useGenericCoreNames;
-
private final int leaderVoteWait;
private final int leaderConflictResolveWait;
@@ -58,7 +56,6 @@ public class CloudConfig {
int zkClientTimeout,
int hostPort,
String hostName,
- boolean useGenericCoreNames,
int leaderVoteWait,
int leaderConflictResolveWait,
String zkCredentialsProviderClass,
@@ -74,7 +71,6 @@ public class CloudConfig {
this.zkClientTimeout = zkClientTimeout;
this.hostPort = hostPort;
this.hostName = hostName;
- this.useGenericCoreNames = useGenericCoreNames;
this.leaderVoteWait = leaderVoteWait;
this.leaderConflictResolveWait = leaderConflictResolveWait;
this.zkCredentialsProviderClass = zkCredentialsProviderClass;
@@ -128,10 +124,6 @@ public class CloudConfig {
return leaderConflictResolveWait;
}
- public boolean getGenericCoreNodeNames() {
- return useGenericCoreNames;
- }
-
public int getCreateCollectionWaitTimeTillActive() {
return createCollectionWaitTimeTillActive;
}
@@ -169,7 +161,6 @@ public class CloudConfig {
private int zkClientTimeout =
SolrZkClientTimeout.DEFAULT_ZK_CLIENT_TIMEOUT;
private final int hostPort;
private final String hostName;
- private boolean useGenericCoreNames;
private int leaderVoteWait = DEFAULT_LEADER_VOTE_WAIT;
private int leaderConflictResolveWait =
DEFAULT_LEADER_CONFLICT_RESOLVE_WAIT;
private String zkCredentialsProviderClass;
@@ -199,11 +190,6 @@ public class CloudConfig {
return this;
}
- public CloudConfigBuilder setUseGenericCoreNames(boolean
useGenericCoreNames) {
- this.useGenericCoreNames = useGenericCoreNames;
- return this;
- }
-
public CloudConfigBuilder setLeaderVoteWait(int leaderVoteWait) {
this.leaderVoteWait = leaderVoteWait;
return this;
@@ -269,7 +255,6 @@ public class CloudConfig {
zkClientTimeout,
hostPort,
hostName,
- useGenericCoreNames,
leaderVoteWait,
leaderConflictResolveWait,
zkCredentialsProviderClass,
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index 53d301b7ce5..b0f17320a1d 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -526,9 +526,6 @@ public class SolrXmlConfig {
case "zkHost":
builder.setZkHost(value);
break;
- case "genericCoreNodeNames":
- builder.setUseGenericCoreNames(Boolean.parseBoolean(value));
- break;
case "zkACLProvider":
builder.setZkACLProviderClass(value);
break;
diff --git a/solr/core/src/test-files/solr/solr-jmxreporter.xml
b/solr/core/src/test-files/solr/solr-jmxreporter.xml
index c54f9495013..c5b296994a4 100644
--- a/solr/core/src/test-files/solr/solr-jmxreporter.xml
+++ b/solr/core/src/test-files/solr/solr-jmxreporter.xml
@@ -27,7 +27,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml
b/solr/core/src/test-files/solr/solr-trackingshardhandler.xml
index 29306d9b423..a0ff99a60db 100644
--- a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml
+++ b/solr/core/src/test-files/solr/solr-trackingshardhandler.xml
@@ -30,7 +30,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
</solrcloud>
diff --git a/solr/core/src/test-files/solr/solr.xml
b/solr/core/src/test-files/solr/solr.xml
index e7019b3172d..92e3d7d6bf3 100644
--- a/solr/core/src/test-files/solr/solr.xml
+++ b/solr/core/src/test-files/solr/solr.xml
@@ -41,7 +41,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:60000}</int>
<!-- This should be high by default - dc's are expensive -->
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:15000}</int> <!-- We are
running tests - the default should be low, not like production -->
<int
name="leaderConflictResolveWait">${leaderConflictResolveWait:45000}</int>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:5000}</int>
diff --git
a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
index b2164dc04fa..b3a3cc72865 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
@@ -41,7 +41,6 @@ public class ClusterStateUpdateTest extends SolrCloudTestCase
{
public static void afterClass() throws Exception {
shutdownCluster();
System.clearProperty("solrcloud.skip.autorecovery");
- System.clearProperty("genericCoreNodeNames");
}
@Test
diff --git
a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
index 7f91caaea44..92b61ce1217 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
@@ -51,7 +51,6 @@ public class CreateCollectionCleanupTest extends
SolrCloudTestCase {
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">10000</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
diff --git
a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
index 5d43631106d..93d95752670 100644
---
a/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
+++
b/solr/core/src/test/org/apache/solr/cloud/api/collections/LocalFSCloudIncrementalBackupTest.java
@@ -52,7 +52,6 @@ public class LocalFSCloudIncrementalBackupTest extends
AbstractIncrementalBackup
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">10000</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
index daf30defc82..574e3572ac5 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -238,8 +238,8 @@ public class TestSolrXml extends SolrTestCaseJ4 {
public void testMultiCloudSectionError() {
String solrXml =
"<solr>"
- + "<solrcloud><bool
name=\"genericCoreNodeNames\">true</bool></solrcloud>"
- + "<solrcloud><bool
name=\"genericCoreNodeNames\">false</bool></solrcloud>"
+ + "<solrcloud><long
name=\"maxUpdateConnections\">1</long></solrcloud>"
+ + "<solrcloud><long
name=\"maxUpdateConnections\">2</long></solrcloud>"
+ "</solr>";
SolrException thrown =
@@ -327,7 +327,7 @@ public class TestSolrXml extends SolrTestCaseJ4 {
public void
testFailAtConfigParseTimeWhenBoolTypeIsExpectedAndValueIsInvalidString() {
String solrXml =
- "<solr><solrcloud><bool
name=\"genericCoreNodeNames\">FOO</bool></solrcloud></solr>";
+ "<solr><solrcloud><bool
name=\"someBooleanProperty\">FOO</bool></solrcloud></solr>";
SolrException thrown =
assertThrows(SolrException.class, () ->
SolrXmlConfig.fromString(solrHome, solrXml));
diff --git a/solr/modules/cross-dc/src/test-files/mirroring-solr.xml
b/solr/modules/cross-dc/src/test-files/mirroring-solr.xml
index b410bb698e1..68355872852 100644
--- a/solr/modules/cross-dc/src/test-files/mirroring-solr.xml
+++ b/solr/modules/cross-dc/src/test-files/mirroring-solr.xml
@@ -21,7 +21,6 @@
<solrcloud>
<str name="host">${solr.host.advertise:}</str>
<int name="hostPort">${solr.port.advertise:0}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="zkClientTimeout">${zkClientTimeout:30000}</int>
<int
name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
diff --git a/solr/modules/cuvs/src/test-files/solr/solr.xml
b/solr/modules/cuvs/src/test-files/solr/solr.xml
index 7506c1c8951..26d92c24f4c 100644
--- a/solr/modules/cuvs/src/test-files/solr/solr.xml
+++ b/solr/modules/cuvs/src/test-files/solr/solr.xml
@@ -32,7 +32,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git
a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java
b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java
index 72ae3b2d47e..846563b929f 100644
---
a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java
+++
b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java
@@ -49,7 +49,6 @@ public class GCSIncrementalBackupTest extends
AbstractIncrementalBackupTest {
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">10000</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
diff --git a/solr/modules/llm/src/test-files/solr/solr.xml
b/solr/modules/llm/src/test-files/solr/solr.xml
index 21a4bd17b0b..c201efd50d9 100644
--- a/solr/modules/llm/src/test-files/solr/solr.xml
+++ b/solr/modules/llm/src/test-files/solr/solr.xml
@@ -32,7 +32,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git a/solr/modules/ltr/src/test-files/solr/solr.xml
b/solr/modules/ltr/src/test-files/solr/solr.xml
index 21a4bd17b0b..c201efd50d9 100644
--- a/solr/modules/ltr/src/test-files/solr/solr.xml
+++ b/solr/modules/ltr/src/test-files/solr/solr.xml
@@ -32,7 +32,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git a/solr/modules/opentelemetry/src/test-files/solr/solr.xml
b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
index 49edb2f4e5b..1f519208496 100644
--- a/solr/modules/opentelemetry/src/test-files/solr/solr.xml
+++ b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
@@ -40,7 +40,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git
a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
index 2ba9479ab45..80c5207505b 100644
---
a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
+++
b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
@@ -58,7 +58,6 @@ public class S3IncrementalBackupTest extends
AbstractIncrementalBackupTest {
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">10000</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
diff --git a/solr/server/solr/solr.xml b/solr/server/solr/solr.xml
index c39cb88a699..ff7c7505c69 100644
--- a/solr/server/solr/solr.xml
+++ b/solr/server/solr/solr.xml
@@ -41,8 +41,6 @@
<str name="host">${solr.host.advertise:}</str>
<int name="hostPort">${solr.port.advertise:0}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
-
<int name="zkClientTimeout">${zkClientTimeout:30000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
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 374388d180c..3e786e598b5 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
@@ -44,8 +44,6 @@ The default `solr.xml` file is found in
`$SOLR_TIP/server/solr/solr.xml` and loo
<str name="host">${solr.host.advertise:}</str>
<int name="hostPort">${solr.port.advertise:0}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
-
<int name="zkClientTimeout">${zkClientTimeout:30000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
@@ -436,16 +434,6 @@ It is used with SolrCloud.
+
In SolrCloud mode, the URL of the ZooKeeper host that Solr should use for
cluster state information.
-`genericCoreNodeNames`::
-+
-[%autowidth,frame=none]
-|===
-|Optional |Default: none
-|===
-+
-If `true`, node names are not based on the address of the node, but on a
generic name that identifies the core.
-When a different machine takes over serving that core things will be much
easier to understand.
-
`zkCredentialsProvider`, `zkACLProvider` & `zkCredentialsInjector`::
+
[%autowidth,frame=none]
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
index ca7a553a152..3e578e6cfdd 100644
--- a/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
@@ -37,7 +37,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">0</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git a/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
b/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
index ffc06e28893..7f48a511a6f 100644
--- a/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
+++ b/solr/solrj/src/test-files/solrj/solr/shared/solr.xml
@@ -32,7 +32,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">0</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git a/solr/solrj/src/test-files/solrj/solr/solr.xml
b/solr/solrj/src/test-files/solrj/solr/solr.xml
index 4db68848b8f..6957862f4d9 100644
--- a/solr/solrj/src/test-files/solrj/solr/solr.xml
+++ b/solr/solrj/src/test-files/solrj/solr/solr.xml
@@ -37,7 +37,6 @@
<str name="host">127.0.0.1</str>
<int name="hostPort">${hostPort:8983}</int>
<int name="zkClientTimeout">${solr.zookeeper.client.timeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
<int name="leaderVoteWait">0</int>
<int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 6b2fe9a8d4e..cbac9ba4c69 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -293,7 +293,6 @@ public abstract class AbstractFullDistribZkTestBase extends
AbstractDistribZkTes
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty("solrcloud.update.delay");
- System.clearProperty("genericCoreNodeNames");
}
public AbstractFullDistribZkTestBase() {
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 5ed9269f0fe..a632928d361 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -124,7 +124,6 @@ public class MiniSolrCloudCluster {
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">${leaderVoteWait:10000}</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
index 5d4c695b4ee..f31b20eb737 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java
@@ -261,7 +261,6 @@ public abstract class AbstractInstallShardTest extends
SolrCloudTestCase {
+ " <str name=\"host\">127.0.0.1</str>\n"
+ " <int name=\"hostPort\">${hostPort:8983}</int>\n"
+ " <int
name=\"zkClientTimeout\">${solr.zookeeper.client.timeout:30000}</int>\n"
- + " <bool
name=\"genericCoreNodeNames\">${genericCoreNodeNames:true}</bool>\n"
+ " <int name=\"leaderVoteWait\">10000</int>\n"
+ " <int
name=\"distribUpdateConnTimeout\">${distribUpdateConnTimeout:45000}</int>\n"
+ " <int
name=\"distribUpdateSoTimeout\">${distribUpdateSoTimeout:340000}</int>\n"
