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 3bbb010f486c..9557d3e7e47e 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java +++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java @@ -167,20 +167,11 @@ public void start() { }, "embeddedZkServer"); - if (zkProps.getServers().size() > 1) { - if (log.isInfoEnabled()) { - log.info( - "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}", - zkProps.getClientPortAddress().getPort(), - zkProps.getClientPortAddress().getAddress().getHostAddress()); - } - } else { - if (log.isInfoEnabled()) { - log.info( - "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}", - zkProps.getClientPortAddress().getPort(), - zkProps.getClientPortAddress().getAddress().getHostAddress()); - } + if (log.isInfoEnabled()) { + log.info( + "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at {}:{}", + zkProps.getClientPortAddress().getAddress().getHostAddress(), + zkProps.getClientPortAddress().getPort()); } zkThread.setDaemon(true); diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java index b5358755d1fe..60362f4a113b 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java @@ -230,7 +230,9 @@ private SolrConfig(SolrResourceLoader loader, String name, Properties substituta .txt(); luceneMatchVersion = SolrConfig.parseLuceneVersionString(val); - log.info("Using Lucene MatchVersion: {}", luceneMatchVersion); + if (!luceneMatchVersion.equals(Version.LATEST)) { + log.info("Using Lucene MatchVersion: {}", luceneMatchVersion); + } String indexConfigPrefix; diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java index 456106d0c877..206c7995e49d 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java +++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java @@ -227,8 +227,7 @@ synchronized void addToClassLoader(List urls) { if (log.isInfoEnabled()) { log.info( - "Added {} libs to classloader, from paths: {}", - urls.size(), + "Added lib dirs to classloader: {}", urls.stream() .map(u -> u.getPath().substring(0, u.getPath().lastIndexOf('/'))) .sorted() diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java index 1a96f5343102..867e912bf066 100644 --- a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java +++ b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java @@ -49,10 +49,6 @@ public class SolrRequestAuthorizer implements ContainerRequestFilter { @Context private ResourceInfo resourceInfo; - public SolrRequestAuthorizer() { - log.info("Creating a new SolrRequestAuthorizer"); - } - @SuppressWarnings("unchecked") @Override public void filter(ContainerRequestContext requestContext) throws IOException { diff --git a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java index a9c14bab2267..ab024789c58d 100644 --- a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java +++ b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java @@ -52,7 +52,10 @@ public static boolean isJvmMetricsEnabled() { + " gauges; guarded by instanceof check so gracefully absent on non-HotSpot JVMs") public OtelRuntimeJvmMetrics initialize( SolrMetricManager solrMetricManager, String registryName) { - if (!isJvmMetricsEnabled()) return this; + if (!isJvmMetricsEnabled()) { + log.info("JVM metrics are disabled"); // log because this isn't a default + return this; + } // a dummy instance; we only care to provide the MeterProvider var otel = @@ -93,16 +96,13 @@ public ContextPropagators getPropagators() { if (free >= 0) measurement.record(free, Attributes.of(STATE_KEY_ATTR, "free")); }, OtelUnit.BYTES); - log.info("Physical memory metrics enabled"); + log.debug("Physical memory metrics enabled"); } else { - if (log.isDebugEnabled()) { - log.debug( - "Physical memory metrics unavailable:" - + " com.sun.management.OperatingSystemMXBean not present on this JVM"); - } + log.info( + "Physical memory metrics unavailable:" + + " com.sun.management.OperatingSystemMXBean not present on this JVM"); } isInitialized = true; - log.info("JVM metrics collection successfully initialized"); return this; } diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java index 05ee9e22869c..3980483fb7ef 100644 --- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java @@ -510,19 +510,6 @@ protected void readSchema(ConfigSetService.ConfigResource is) { try { rootNode = is.get(); name = rootNode.attributes().get("name"); - StringBuilder sb = new StringBuilder(); - // Another case where the initialization from the test harness is different than the "real - // world" - if (name == null) { - sb.append("schema has no name!"); - log.warn("{}", sb); - } else { - sb.append("Schema "); - sb.append(NAME); - sb.append("="); - sb.append(name); - log.info("{}", sb); - } version = Float.parseFloat(rootNode.attributes().getOrDefault("version", "1.0f")); diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java index 7ac64e86a230..acbb88283165 100644 --- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java @@ -106,7 +106,7 @@ public String init(NamedList config, SolrCore core) { SolrParams params = config.toSolrParams(); - log.info("init: {}", config); + log.debug("init: {}", config); String name = super.init(config, core); Comparator comp = SuggestWordQueue.DEFAULT_COMPARATOR; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java index 831b22b41c80..abb76cb3dbe5 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java @@ -165,8 +165,8 @@ public UpdateHandler(SolrCore core, UpdateLog updateLog, boolean initUlog) { ? dirFactory.newDefaultUpdateLog() : core.getResourceLoader().newInstance(ulogPluginInfo, UpdateLog.class, true); - if (log.isInfoEnabled()) { - log.info("Using UpdateLog implementation: {}", ulog.getClass().getName()); + if (log.isDebugEnabled()) { + log.debug("Using UpdateLog implementation: {}", ulog.getClass().getName()); } ulog.init(ulogPluginInfo); diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml index 236304a74cb5..dbb1924c44b8 100644 --- a/solr/server/solr/configsets/_default/conf/solrconfig.xml +++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml @@ -476,23 +476,19 @@ + + solrprice asc + rocksweight asc - + static firstSearcher warming in solrconfig.xml + -->