You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/01/05 15:04:04 UTC
lucene-solr:branch_6x: SOLR-9923: Remove solr.http metric group and
merge its metrics to solr.node group
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 5a93f8327 -> 9bf72748b
SOLR-9923: Remove solr.http metric group and merge its metrics to solr.node group
(cherry picked from commit e5d2884)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9bf72748
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9bf72748
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9bf72748
Branch: refs/heads/branch_6x
Commit: 9bf72748b0e3451b316ee06ebe6a6b012791fa26
Parents: 5a93f83
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Jan 5 20:25:23 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jan 5 20:33:56 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 6 +++---
.../src/java/org/apache/solr/core/CoreContainer.java | 5 ++---
.../src/java/org/apache/solr/core/SolrInfoMBean.java | 4 ++--
.../solr/handler/component/HttpShardHandlerFactory.java | 8 +++++---
.../java/org/apache/solr/update/UpdateShardHandler.java | 11 ++++++-----
.../solr/util/stats/InstrumentedHttpRequestExecutor.java | 2 +-
.../apache/solr/handler/admin/MetricsHandlerTest.java | 5 +----
7 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b72dc6e..b387390 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -63,7 +63,7 @@ Upgrade Notes
risk in overlapping commits. Nonetheless users should continue to avoid excessive committing. Users are
advised to remove any pre-existing maxWarmingSearchers entries from their solrconfig.xml files.
-* SOLR-7466: complexphrase query parser now supports leading wildcards. Beware of its' possible heaviness.
+* SOLR-7466: complexphrase query parser now supports leading wildcards. Beware of its' possible heaviness.
Users are encouraged to use ReversedWildcardFilter in index time analysis.
New Features
@@ -158,11 +158,11 @@ New Features
* SOLR-8530: Add HavingStream to Streaming API and StreamingExpressions (Joel Bernstein)
-* SOLR-9877: Use instrumented http client and connection pool. (shalin)
+* SOLR-9877: SOLR-9923: Use instrumented http client and connection pool. (shalin)
* SOLR-9896: Instrument and collect metrics from query, update, core admin and core load thread pools. (shalin)
-* SOLR-7466: Enable leading wildcard in complexphrase query parser, optimize it with ReversedWildcardFilterFactory
+* SOLR-7466: Enable leading wildcard in complexphrase query parser, optimize it with ReversedWildcardFilterFactory
when it's provided (Mikhail Khludnev)
Optimizations
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 4e87d98..902fcec 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -449,11 +449,11 @@ public class CoreContainer {
shardHandlerFactory = ShardHandlerFactory.newInstance(cfg.getShardHandlerFactoryPluginInfo(), loader);
if (shardHandlerFactory instanceof SolrMetricProducer) {
SolrMetricProducer metricProducer = (SolrMetricProducer) shardHandlerFactory;
- metricProducer.initializeMetrics(metricManager, SolrInfoMBean.Group.http.toString(), "httpShardHandler");
+ metricProducer.initializeMetrics(metricManager, SolrInfoMBean.Group.node.toString(), "httpShardHandler");
}
updateShardHandler = new UpdateShardHandler(cfg.getUpdateShardHandlerConfig());
- updateShardHandler.initializeMetrics(metricManager, SolrInfoMBean.Group.http.toString(), "updateShardHandler");
+ updateShardHandler.initializeMetrics(metricManager, SolrInfoMBean.Group.node.toString(), "updateShardHandler");
solrCores.allocateLazyCores(cfg.getTransientCacheSize(), loader);
@@ -489,7 +489,6 @@ public class CoreContainer {
metricManager.loadReporters(cfg.getMetricReporterPlugins(), loader, SolrInfoMBean.Group.node);
metricManager.loadReporters(cfg.getMetricReporterPlugins(), loader, SolrInfoMBean.Group.jvm);
metricManager.loadReporters(cfg.getMetricReporterPlugins(), loader, SolrInfoMBean.Group.jetty);
- metricManager.loadReporters(cfg.getMetricReporterPlugins(), loader, SolrInfoMBean.Group.http);
coreConfigService = ConfigSetService.createConfigSetService(cfg, loader, zkSys.zkController);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
index c64af47..421a4ef 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
@@ -32,12 +32,12 @@ public interface SolrInfoMBean {
/**
* Category of {@link SolrCore} component.
*/
- enum Category { CORE, QUERYHANDLER, UPDATEHANDLER, CACHE, HIGHLIGHTING, QUERYPARSER, SEARCHER, INDEX, DIRECTORY, OTHER }
+ enum Category { CORE, QUERYHANDLER, UPDATEHANDLER, CACHE, HIGHLIGHTING, QUERYPARSER, SEARCHER, INDEX, DIRECTORY, HTTP, OTHER }
/**
* Top-level group of beans for a subsystem.
*/
- enum Group { jvm, jetty, http, node, core }
+ enum Group { jvm, jetty, node, core }
/**
* Simple common usage name, e.g. BasicQueryHandler,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 502ae7f..a22c8f7 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -54,6 +54,7 @@ import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.URLUtil;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.PluginInfo;
+import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricProducer;
import org.apache.solr.request.SolrQueryRequest;
@@ -406,13 +407,14 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
@Override
public void initializeMetrics(SolrMetricManager manager, String registry, String scope) {
- clientConnectionManager.initializeMetrics(manager, registry, scope);
+ String expandedScope = SolrMetricManager.mkName(scope, SolrInfoMBean.Category.HTTP.name());
+ clientConnectionManager.initializeMetrics(manager, registry, expandedScope);
if (defaultClient instanceof SolrMetricProducer) {
SolrMetricProducer solrMetricProducer = (SolrMetricProducer) defaultClient;
- solrMetricProducer.initializeMetrics(manager, registry, scope);
+ solrMetricProducer.initializeMetrics(manager, registry, expandedScope);
}
commExecutor = MetricUtils.instrumentedExecutorService(commExecutor,
manager.registry(registry),
- SolrMetricManager.mkName("httpShardExecutor", scope, "threadPool"));
+ SolrMetricManager.mkName("httpShardExecutor", expandedScope, "threadPool"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 65bcc0c..5f09ad2 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -122,17 +122,18 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoMBean {
@Override
public void initializeMetrics(SolrMetricManager manager, String registry, String scope) {
- clientConnectionManager.initializeMetrics(manager, registry, scope);
+ String expandedScope = SolrMetricManager.mkName(scope, getCategory().name());
+ clientConnectionManager.initializeMetrics(manager, registry, expandedScope);
if (client instanceof SolrMetricProducer) {
SolrMetricProducer solrMetricProducer = (SolrMetricProducer) client;
- solrMetricProducer.initializeMetrics(manager, registry, scope);
+ solrMetricProducer.initializeMetrics(manager, registry, expandedScope);
}
updateExecutor = new InstrumentedExecutorService(updateExecutor,
manager.registry(registry),
- SolrMetricManager.mkName("updateExecutor", scope, "threadPool"));
+ SolrMetricManager.mkName("updateExecutor", expandedScope, "threadPool"));
recoveryExecutor = new InstrumentedExecutorService(recoveryExecutor,
manager.registry(registry),
- SolrMetricManager.mkName("recoveryExecutor", scope, "threadPool"));
+ SolrMetricManager.mkName("recoveryExecutor", expandedScope, "threadPool"));
}
@Override
@@ -142,7 +143,7 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoMBean {
@Override
public Category getCategory() {
- return null;
+ return Category.HTTP;
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
index 6f3f759..91ddd8a 100644
--- a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
+++ b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
@@ -44,7 +44,7 @@ public class InstrumentedHttpRequestExecutor extends HttpRequestExecutor impleme
protected String scope;
private static String methodNameString(HttpRequest request) {
- return request.getRequestLine().getMethod().toLowerCase(Locale.ROOT) + "-requests";
+ return request.getRequestLine().getMethod().toLowerCase(Locale.ROOT) + ".requests";
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bf72748/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index 67bf0e3..a3e724a 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -42,10 +42,8 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
NamedList values = resp.getValues();
assertNotNull(values.get("metrics"));
values = (NamedList) values.get("metrics");
- System.out.println(values);
assertNotNull(values.get("solr.jetty"));
assertNotNull(values.get("solr.jvm"));
- assertNotNull(values.get("solr.http"));
assertNotNull(values.get("solr.node"));
NamedList nl = (NamedList) values.get("solr.core.collection1");
assertNotNull(nl);
@@ -100,9 +98,8 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {
values = resp.getValues();
assertNotNull(values.get("metrics"));
values = (NamedList) values.get("metrics");
- assertEquals(5, values.size());
+ assertEquals(4, values.size());
assertEquals(0, ((NamedList)values.get("solr.jvm")).size());
- assertEquals(0, ((NamedList)values.get("solr.http")).size());
assertEquals(0, ((NamedList)values.get("solr.jetty")).size());
assertEquals(0, ((NamedList)values.get("solr.core.collection1")).size());
assertEquals(3, ((NamedList)values.get("solr.node")).size());