Apache Solr open-source search software
SOLR-14878: Expose solr.xml's coreRootDirectory property via the System Settings API (#1894)
Alexandre Rafalovitchf6e8bc8c31fa
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 869944c94b8..8c33e79e9ba 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -48,6 +48,8 @@ Improvements* SOLR-14799: JWT authentication plugin only requires "sub" claim when principalClaim=sub. (Erik Hatcher)+* SOLR-14878: Report solr.xml's coreRootDirectory property via System Settings API, when set (Alexandre Rafalovitch)+Other Changes----------------------* SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.javaindex 9c4828c29f3..dc270df5060 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java@@ -23,6 +23,7 @@ import java.lang.management.ManagementFactory;import java.lang.management.OperatingSystemMXBean;import java.lang.management.RuntimeMXBean;import java.net.InetAddress;+import java.nio.file.Path;import java.text.DecimalFormat;import java.text.DecimalFormatSymbols;import java.util.Date;@@ -139,8 +140,19 @@ public class SystemInfoHandler extends RequestHandlerBaseif (solrCloudMode) {rsp.add("zkHost", getCoreContainer(req, core).getZkController().getZkServerAddress());}- if (cc != null)- rsp.add( "solr_home", cc.getSolrHome());+ if (cc != null) {+ String solrHome = cc.getSolrHome();+ rsp.add("solr_home", solrHome);++ Path coreRootDirectory = cc.getCoreRootDirectory();+ if (coreRootDirectory != null) {+ String coreRootDirectoryString = coreRootDirectory.toString();+ if (!coreRootDirectoryString.equals(solrHome)) {+ rsp.add("solr_core_root", coreRootDirectoryString);+ }+ }+ }+rsp.add( "lucene", getLuceneInfo() );rsp.add( "jvm", getJvmInfo() );rsp.add( "security", getSecurityInfo(req) );