Apache Solr open-source search software
SOLR-15301: Eliminate repetitive index size calculation for Solr metrics
Andras Salamon36f5e4155dd2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 74980ec2889..0200899c200 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -157,6 +157,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)for an HTTP proxy. This is only for the Apache HttpClient based SolrJ communication, not Jetty.(Shawn Heisey, David Smiley)+* SOLR-15301: Eliminate repetitive index size calculation for Solr metrics (Andras Salamon)+Build---------------------diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 9275c9a02f4..79a78a6db73 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -470,6 +470,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {return indexReaderFactory;}+ private ThreadLocal<Long> indexSize = new ThreadLocal<>();+public long getIndexSize() {Directory dir;long size = 0;@@ -488,6 +490,25 @@ public final class SolrCore implements SolrInfoBean, Closeable {return size;}+ public long getCachedIndexSize() {+ if (indexSize.get() == null) {+ if (log.isDebugEnabled()) {+ log.debug("Recalculating index size for {}", getName());+ }+ indexSize.set(getIndexSize());+ } else if (log.isDebugEnabled()) {+ log.debug("reusing previous index size for {}", getName());+ }+ return indexSize.get();+ }++ public void clearIndexSizeCache() {+ if (log.isDebugEnabled()) {+ log.debug("Clearing index size cache for {}", getName());+ }+ indexSize.remove();+ }+public int getSegmentCount() {try {return withSearcher( solrIndexSearcher -> solrIndexSearcher.getRawReader().getIndexCommit().getSegmentCount());@@ -1209,9 +1230,9 @@ public final class SolrCore implements SolrInfoBean, Closeable {parentContext.gauge(() -> getOpenCount(), true, "refCount", Category.CORE.toString());parentContext.gauge(() -> getInstancePath().toString(), true, "instanceDir", Category.CORE.toString());parentContext.gauge(() -> isClosed() ? parentContext.nullString() : getIndexDir(), true, "indexDir", Category.CORE.toString());- parentContext.gauge(() -> isClosed() ? parentContext.nullNumber() : getIndexSize(), true, "sizeInBytes", Category.INDEX.toString());+ parentContext.gauge(() -> isClosed() ? parentContext.nullNumber() : getCachedIndexSize(), true, "sizeInBytes", Category.INDEX.toString());parentContext.gauge(() -> isClosed() ? parentContext.nullNumber() : getSegmentCount(), true, "segments", Category.INDEX.toString());- parentContext.gauge(() -> isClosed() ? parentContext.nullString() : NumberUtils.readableSize(getIndexSize()), true, "size", Category.INDEX.toString());+ parentContext.gauge(() -> isClosed() ? parentContext.nullString() : NumberUtils.readableSize(getCachedIndexSize()), true, "size", Category.INDEX.toString());final CloudDescriptor cd = getCoreDescriptor().getCloudDescriptor();if (cd != null) {diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.javaindex 71fe0f4e849..c8746f74514 100644--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java@@ -886,7 +886,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw@Overridepublic void initializeMetrics(SolrMetricsContext parentContext, String scope) {super.initializeMetrics(parentContext, scope);- solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? NumberUtils.readableSize(core.getIndexSize()) : parentContext.nullString()),+ solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? NumberUtils.readableSize(core.getCachedIndexSize()) : parentContext.nullString()),true, "indexSize", getCategory().toString(), scope);solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? getIndexVersion().toString() : parentContext.nullString()),true, "indexVersion", getCategory().toString(), scope);diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.javaindex 52d90f96f16..b46fbf51390 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java@@ -117,6 +117,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionNameconsumer.accept("error", "metrics collection is disabled");return;}+ cc.getCores().forEach((core) -> core.clearIndexSizeCache());boolean compact = params.getBool(COMPACT_PARAM, true);String[] keys = params.getParams(KEY_PARAM);if (keys != null && keys.length > 0) {