Apache Solr open-source search software
Flip solr.hideStackTrace to solr.responses.stacktrace.enabled equivalent. (#3503)
Eric Pughdea67fd777d3
diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.javaindex 91c14eb72ad..290c17835b4 100644--- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java+++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java@@ -618,7 +618,8 @@ public class NodeConfig {private String defaultZkHost;private Set<Path> allowPaths = Collections.emptySet();private List<String> allowUrls = Collections.emptyList();- private boolean hideStackTrace = Boolean.getBoolean("solr.hideStackTrace");+ private boolean hideStackTrace =+ !(Boolean.parseBoolean(System.getProperty("solr.responses.stacktrace.enabled", "true")));private final Path solrHome;private final String nodeName;diff --git a/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.javaindex 22b5a2ec8ea..6f613016cf8 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java@@ -232,6 +232,12 @@ public class EnvUtils {deprecatedKey,key);setProperty(key, String.valueOf(!Boolean.getBoolean(deprecatedKey)));+ } else if (deprecatedKey.equals("solr.hide.stack.trace")) {+ log.warn(+ "Converting from legacy system property {} to modern .enabled equivalent {} by flipping the boolean property value.",+ deprecatedKey,+ key);+ setProperty(key, String.valueOf(!Boolean.getBoolean(deprecatedKey)));} else {setProperty(key, sysProperties.getProperty(deprecatedKey));}diff --git a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.propertiesindex 88c0210edcc..da2227a7b72 100644--- a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties+++ b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties@@ -19,3 +19,4 @@ solr.enable.remote.streaming=solr.requests.streaming.remote.enabledsolr.enable.stream.body=solr.requests.streaming.body.enabledsolr.delete.unknown.cores=solr.cloud.startup.delete.unknown.cores.enabledsolr.config.set.forbidden.file.types=solr.configset.forbidden.file.types+solr.hide.stack.trace=solr.responses.stacktrace.enabled