You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2023/05/15 16:32:08 UTC
[solr] branch branch_9x updated: add aggregateNodeLevelMetricsEnabled for updatehandler metrics (#1630)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new e32fc80a4bc add aggregateNodeLevelMetricsEnabled for updatehandler metrics (#1630)
e32fc80a4bc is described below
commit e32fc80a4bc13ef3e8a203d391f9115de824958e
Author: Noble Paul <no...@users.noreply.github.com>
AuthorDate: Tue May 16 02:29:45 2023 +1000
add aggregateNodeLevelMetricsEnabled for updatehandler metrics (#1630)
---
.../src/java/org/apache/solr/core/SolrConfig.java | 30 ++++++++++++++--------
.../apache/solr/update/DirectUpdateHandler2.java | 14 +++++++++-
2 files changed, 32 insertions(+), 12 deletions(-)
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 fd9b05f86cf..c976f1a8c7f 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -586,17 +586,7 @@ public class SolrConfig implements MapSerializable {
}
protected UpdateHandlerInfo loadUpdatehandlerInfo() {
- ConfigNode updateHandler = get("updateHandler");
- ConfigNode autoCommit = updateHandler.get("autoCommit");
- return new UpdateHandlerInfo(
- updateHandler.attr("class"),
- autoCommit.get("maxDocs").intVal(-1),
- autoCommit.get("maxTime").intVal(-1),
- convertHeapOptionStyleConfigStringToBytes(autoCommit.get("maxSize").txt()),
- autoCommit.get("openSearcher").boolVal(true),
- updateHandler.get("autoSoftCommit").get("maxDocs").intVal(-1),
- updateHandler.get("autoSoftCommit").get("maxTime").intVal(-1),
- updateHandler.get("commitWithin").get("softCommit").boolVal(true));
+ return new UpdateHandlerInfo(get("updateHandler"));
}
/**
@@ -815,6 +805,7 @@ public class SolrConfig implements MapSerializable {
public final long autoCommitMaxSizeBytes;
public final boolean openSearcher; // is opening a new searcher part of hard autocommit?
public final boolean commitWithinSoftCommit;
+ public final boolean aggregateNodeLevelMetricsEnabled;
/**
* @param autoCommmitMaxDocs set -1 as default
@@ -840,6 +831,23 @@ public class SolrConfig implements MapSerializable {
this.autoSoftCommmitMaxTime = autoSoftCommmitMaxTime;
this.commitWithinSoftCommit = commitWithinSoftCommit;
+ this.aggregateNodeLevelMetricsEnabled = false;
+ }
+
+ public UpdateHandlerInfo(ConfigNode updateHandler) {
+ ConfigNode autoCommit = updateHandler.get("autoCommit");
+ this.className = updateHandler.attr("class");
+ this.autoCommmitMaxDocs = autoCommit.get("maxDocs").intVal(-1);
+ this.autoCommmitMaxTime = autoCommit.get("maxTime").intVal(-1);
+ this.autoCommitMaxSizeBytes =
+ convertHeapOptionStyleConfigStringToBytes(autoCommit.get("maxSize").txt());
+ this.openSearcher = autoCommit.get("openSearcher").boolVal(true);
+ this.autoSoftCommmitMaxDocs = updateHandler.get("autoSoftCommit").get("maxDocs").intVal(-1);
+ this.autoSoftCommmitMaxTime = updateHandler.get("autoSoftCommit").get("maxTime").intVal(-1);
+ this.commitWithinSoftCommit =
+ updateHandler.get("commitWithin").get("softCommit").boolVal(true);
+ this.aggregateNodeLevelMetricsEnabled =
+ updateHandler.boolAttr("aggregateNodeLevelMetricsEnabled", false);
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index 772779a1926..e39f23751e1 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -50,6 +50,9 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrConfig.UpdateHandlerInfo;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.core.SolrInfoBean;
+import org.apache.solr.metrics.SolrDelegateRegistryMetricsContext;
+import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricProducer;
import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.request.LocalSolrQueryRequest;
@@ -196,7 +199,16 @@ public class DirectUpdateHandler2 extends UpdateHandler
@Override
public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
- solrMetricsContext = parentContext.getChildContext(this);
+ if (core.getSolrConfig().getUpdateHandlerInfo().aggregateNodeLevelMetricsEnabled) {
+ this.solrMetricsContext =
+ new SolrDelegateRegistryMetricsContext(
+ parentContext.getMetricManager(),
+ parentContext.getRegistryName(),
+ SolrMetricProducer.getUniqueMetricTag(this, parentContext.getTag()),
+ SolrMetricManager.getRegistryName(SolrInfoBean.Group.node));
+ } else {
+ this.solrMetricsContext = parentContext.getChildContext(this);
+ }
commitCommands = solrMetricsContext.meter("commits", getCategory().toString(), scope);
solrMetricsContext.gauge(
() -> commitTracker.getCommitCount(), true, "autoCommits", getCategory().toString(), scope);