This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_10_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_10_0 by this push:
new 79ac3c77baa Remove obsolete managementPath related code (#3906)
79ac3c77baa is described below
commit 79ac3c77baa38e6b532f079e1fc227feb4c03395
Author: Eric Pugh <[email protected]>
AuthorDate: Mon Dec 1 07:50:41 2025 -0500
Remove obsolete managementPath related code (#3906)
---
.../core/src/java/org/apache/solr/core/CoreContainer.java | 10 ----------
solr/core/src/java/org/apache/solr/core/NodeConfig.java | 15 ---------------
.../core/src/java/org/apache/solr/core/SolrXmlConfig.java | 3 ---
.../src/java/org/apache/solr/servlet/HttpSolrCall.java | 6 ------
solr/core/src/test-files/solr/solr-50-all.xml | 1 -
solr/core/src/test/org/apache/solr/core/TestSolrXml.java | 1 -
.../configuration-guide/pages/configuring-solr-xml.adoc | 9 ---------
7 files changed, 45 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 42f8bd2ec7e..cccb6bd8f2e 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -2240,16 +2240,6 @@ public class CoreContainer {
return this.hostName;
}
- /**
- * Gets the alternate path for multicore handling: This is used in case
there is a registered
- * unnamed core (aka name is "") to declare an alternate way of accessing
named cores. This can
- * also be used in a pseudo single-core environment so admins can prepare a
new version before
- * swapping.
- */
- public String getManagementPath() {
- return cfg.getManagementPath();
- }
-
public LogWatcher<?> getLogging() {
return logging;
}
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java
b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
index 1aad555057b..880c9d42d03 100644
--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java
@@ -109,8 +109,6 @@ public class NodeConfig {
private final boolean useSchemaCache;
- private final String managementPath;
-
private final PluginInfo[] backupRepositoryPlugins;
private final MetricsConfig metricsConfig;
@@ -146,7 +144,6 @@ public class NodeConfig {
int replayUpdatesThreads,
int indexSearcherExecutorThreads,
boolean useSchemaCache,
- String managementPath,
Path solrHome,
SolrResourceLoader loader,
Properties solrProperties,
@@ -185,7 +182,6 @@ public class NodeConfig {
this.replayUpdatesThreads = replayUpdatesThreads;
this.indexSearcherExecutorThreads = indexSearcherExecutorThreads;
this.useSchemaCache = useSchemaCache;
- this.managementPath = managementPath;
this.solrHome = solrHome;
this.loader = loader;
this.solrProperties = solrProperties;
@@ -380,10 +376,6 @@ public class NodeConfig {
return useSchemaCache;
}
- public String getManagementPath() {
- return managementPath;
- }
-
/** Absolute. */
public Path getConfigSetBaseDirectory() {
return configSetBaseDirectory;
@@ -600,7 +592,6 @@ public class NodeConfig {
private int replayUpdatesThreads =
Runtime.getRuntime().availableProcessors();
private int indexSearcherExecutorThreads =
DEFAULT_INDEX_SEARCHER_EXECUTOR_THREADS;
private boolean useSchemaCache = false;
- private String managementPath;
private Properties solrProperties = new Properties();
private PluginInfo[] backupRepositoryPlugins;
private MetricsConfig metricsConfig;
@@ -769,11 +760,6 @@ public class NodeConfig {
return this;
}
- public NodeConfigBuilder setManagementPath(String managementPath) {
- this.managementPath = managementPath;
- return this;
- }
-
public NodeConfigBuilder setSolrProperties(Properties solrProperties) {
this.solrProperties = solrProperties;
return this;
@@ -899,7 +885,6 @@ public class NodeConfig {
replayUpdatesThreads,
indexSearcherExecutorThreads,
useSchemaCache,
- managementPath,
solrHome,
loader,
solrProperties,
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 b0f17320a1d..459b58f13c5 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -348,9 +348,6 @@ public class SolrXmlConfig {
case "maxBooleanClauses":
builder.setBooleanQueryMaxClauseCount(it.intVal(-1));
break;
- case "managementPath":
- builder.setManagementPath(it.txt());
- break;
case "sharedLib":
builder.setSharedLibDirectory(it.txt());
break;
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 417467a9760..d213ee52ccd 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -196,12 +196,6 @@ public class HttpSolrCall {
reason =
"Set the thread contextClassLoader for all 3rd party dependencies
that we cannot control")
protected void init() throws Exception {
- // check for management path
- String alternate = cores.getManagementPath();
- if (alternate != null && path.startsWith(alternate)) {
- path = path.substring(0, alternate.length());
- }
-
queryParams = SolrRequestParsers.parseQueryString(req.getQueryString());
// Check for container handlers
diff --git a/solr/core/src/test-files/solr/solr-50-all.xml
b/solr/core/src/test-files/solr/solr-50-all.xml
index de015c4213c..282ee4385cd 100644
--- a/solr/core/src/test-files/solr/solr-50-all.xml
+++ b/solr/core/src/test-files/solr/solr-50-all.xml
@@ -22,7 +22,6 @@
<str
name="coreRootDirectory">${coreRootDirectory:testCoreRootDirectory}</str>
<str name="infoHandler">testInfoHandler</str>
<str name="configSetsHandler">testConfigSetsHandler</str>
- <str name="managementPath">testManagementPath</str>
<str name="sharedLib">testSharedLib</str>
<str name="allowPaths">${solr.security.allow.paths:}</str>
<str name="shareSchema">${shareSchema:true}</str>
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 574e3572ac5..eeab65afbf1 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
@@ -113,7 +113,6 @@ public class TestSolrXml extends SolrTestCaseJ4 {
assertTrue("log watcher", cfg.getLogWatcherConfig().isEnabled());
assertEquals("log watcher size", 88,
cfg.getLogWatcherConfig().getWatcherSize());
assertEquals("log watcher thresh", "99",
cfg.getLogWatcherConfig().getWatcherThreshold());
- assertEquals("manage path", "testManagementPath", cfg.getManagementPath());
assertEquals("shardLib", "testSharedLib", cfg.getSharedLibDirectory());
assertTrue("schema cache", cfg.hasSchemaCache());
assertEquals("zk client timeout", 77, ccfg.getZkClientTimeout());
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 3e786e598b5..a1032f5ecf7 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
@@ -217,15 +217,6 @@ If used, this attribute should be set to the FQN (fully
qualified name) of a cla
This service is used when Solr is starting to prioritize which cores should be
loaded first.
For example, `<str name="coresLocator">com.myorg.CustomCoresLocator</str>`
would configure a custom core sorter.
-`managementPath`::
-+
-[%autowidth,frame=none]
-|===
-|Optional |Default: none
-|===
-+
-Currently non-operational.
-
`sharedLib`::
+
[%autowidth,frame=none]
