You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by is...@apache.org on 2023/01/23 14:44:57 UTC
[solr] branch main updated: SOLR-15616: Fixing tidy formatting
This is an automated email from the ASF dual-hosted git repository.
ishan 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 9f2a95f5fab SOLR-15616: Fixing tidy formatting
9f2a95f5fab is described below
commit 9f2a95f5fabfb4e14fa91481367a3c4ca153c3b9
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Mon Jan 23 20:13:30 2023 +0530
SOLR-15616: Fixing tidy formatting
---
.../java/org/apache/solr/core/MetricsConfig.java | 2 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 9 ++++++--
.../apache/solr/servlet/CoreContainerProvider.java | 24 ++++++++++++++++------
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/MetricsConfig.java b/solr/core/src/java/org/apache/solr/core/MetricsConfig.java
index fd6dc5cd7c5..08f039927d2 100644
--- a/solr/core/src/java/org/apache/solr/core/MetricsConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/MetricsConfig.java
@@ -244,7 +244,7 @@ public class MetricsConfig {
public static class CacheConfig {
public Integer threadsIntervalSeconds; // intervals for which the threads metrics are cached
- public CacheConfig (Integer threadsIntervalSeconds) {
+ public CacheConfig(Integer threadsIntervalSeconds) {
this.threadsIntervalSeconds = threadsIntervalSeconds;
}
}
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 a8a2c45cca2..d2e8bf1e6a5 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -659,8 +659,13 @@ public class SolrXmlConfig {
ConfigNode caching = metrics.get("solr/metrics/caching");
if (caching != null) {
- Object threadsCachingIntervalSeconds = DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds", null);
- builder.setCacheConfig(new MetricsConfig.CacheConfig(threadsCachingIntervalSeconds == null? null: Integer.parseInt(threadsCachingIntervalSeconds.toString())));
+ Object threadsCachingIntervalSeconds =
+ DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds", null);
+ builder.setCacheConfig(
+ new MetricsConfig.CacheConfig(
+ threadsCachingIntervalSeconds == null
+ ? null
+ : Integer.parseInt(threadsCachingIntervalSeconds.toString())));
}
PluginInfo[] reporterPlugins = getMetricReporterPluginInfos(metrics);
diff --git a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
index 99458db9e50..e8880270621 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
@@ -429,13 +429,25 @@ public class CoreContainerProvider implements ServletContextListener {
metricManager.registerAll(
registryName, new MemoryUsageGaugeSet(), ResolutionStrategy.IGNORE, "memory");
- if (config.getCacheConfig() != null && config.getCacheConfig().threadsIntervalSeconds != null) {
- if (log.isInfoEnabled()) {
- log.info("Threads metrics will be cached for {} seconds", config.getCacheConfig().threadsIntervalSeconds);
- }
- metricManager.registerAll(registryName, new CachedThreadStatesGaugeSet(config.getCacheConfig().threadsIntervalSeconds, TimeUnit.SECONDS), SolrMetricManager.ResolutionStrategy.IGNORE, "threads");
+ if (config.getCacheConfig() != null
+ && config.getCacheConfig().threadsIntervalSeconds != null) {
+ if (log.isInfoEnabled()) {
+ log.info(
+ "Threads metrics will be cached for {} seconds",
+ config.getCacheConfig().threadsIntervalSeconds);
+ }
+ metricManager.registerAll(
+ registryName,
+ new CachedThreadStatesGaugeSet(
+ config.getCacheConfig().threadsIntervalSeconds, TimeUnit.SECONDS),
+ SolrMetricManager.ResolutionStrategy.IGNORE,
+ "threads");
} else {
- metricManager.registerAll(registryName, new ThreadStatesGaugeSet(), SolrMetricManager.ResolutionStrategy.IGNORE, "threads");
+ metricManager.registerAll(
+ registryName,
+ new ThreadStatesGaugeSet(),
+ SolrMetricManager.ResolutionStrategy.IGNORE,
+ "threads");
}
MetricsMap sysprops =