Apache Solr open-source search software
SOLR-15081: Metrics for core: isLeader, replicaState (#2198)
David Smileya233ed2fd1bc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 497f01e55e0..e6782e0131d 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -201,13 +201,12 @@ New FeaturesImprovements-----------------------* SOLR-15079: Block Collapse - Faster collapse code when groups are co-located via Block Join style nested doc indexing.- Used by default when field=_root_, or explicitly requsted for other fields via hint=block. (Joel Bernstein, hossman)+* SOLR-15081: Metrics for a core: add SolrCloud "isLeader" and "replicaState". (David Smiley)Optimizations----------------------(No changes)+* SOLR-15079: Block Collapse - Faster collapse code when groups are co-located via Block Join style nested doc indexing.+ Used by default when field=_root_, or explicitly requested for other fields via hint=block. (Joel Bernstein, hossman)Bug Fixes---------------------diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex c01f4c4b5c2..66643b0458e 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -1203,26 +1203,19 @@ public final class SolrCore implements SolrInfoBean, Closeable {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.nullString() : NumberUtils.readableSize(getIndexSize()), true, "size", Category.INDEX.toString());- if (coreContainer != null) {- final CloudDescriptor cd = getCoreDescriptor().getCloudDescriptor();- if (cd != null) {- parentContext.gauge(() -> {- if (cd.getCollectionName() != null) {- return cd.getCollectionName();- } else {- return parentContext.nullString();- }- }, true, "collection", Category.CORE.toString());- parentContext.gauge(() -> {- if (cd.getShardId() != null) {- return cd.getShardId();- } else {- return parentContext.nullString();- }- }, true, "shard", Category.CORE.toString());- }+ final CloudDescriptor cd = getCoreDescriptor().getCloudDescriptor();+ if (cd != null) {+ parentContext.gauge(cd::getCollectionName, true, "collection", Category.CORE.toString());+ parentContext.gauge(cd::getShardId, true, "shard", Category.CORE.toString());+ parentContext.gauge(cd::isLeader, true, "isLeader", Category.CORE.toString());+ parentContext.gauge(+ () -> String.valueOf(cd.getLastPublished()),+ true,+ "replicaState",+ Category.CORE.toString());}+// initialize disk total / free metricsPath dataDirPath = Paths.get(dataDir);File dataDirFile = dataDirPath.toFile();