You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/03/14 09:21:10 UTC
[32/32] lucene-solr:jira/solr-10247: Merge branch 'master' into
jira/solr-10247
Merge branch 'master' into jira/solr-10247
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5a2c2f66
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5a2c2f66
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5a2c2f66
Branch: refs/heads/jira/solr-10247
Commit: 5a2c2f6635b0b25e8dd2af0e6798771f1de0be13
Parents: be807c9 e3a0b42
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Mar 13 22:53:27 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Mar 13 22:53:27 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 10 ++
.../org/apache/solr/cloud/RecoveryStrategy.java | 106 ++++++++++++++----
.../java/org/apache/solr/core/SolrConfig.java | 2 +
.../src/java/org/apache/solr/core/SolrCore.java | 22 +++-
.../solr/update/DefaultSolrCoreState.java | 15 ++-
.../org/apache/solr/update/SolrCoreState.java | 6 +
.../processor/AtomicUpdateDocumentMerger.java | 11 +-
.../org/apache/solr/util/stats/MetricUtils.java | 11 +-
.../solrconfig-configurerecoverystrategy.xml | 28 +++++
.../conf/solrconfig-customrecoverystrategy.xml | 32 ++++++
.../core/ConfigureRecoveryStrategyTest.java | 111 +++++++++++++++++++
.../solr/handler/admin/MetricsHandlerTest.java | 13 ++-
.../solr/update/TestInPlaceUpdatesDistrib.java | 89 +++++++++++----
.../update/processor/AtomicUpdatesTest.java | 3 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 17 ++-
.../client/solrj/impl/CloudSolrClientTest.java | 48 ++++++++
16 files changed, 459 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a2c2f66/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a2c2f66/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java
index ca0fd2b,70fd467..ba1284e
--- a/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java
@@@ -117,18 -116,14 +118,14 @@@ public class MetricUtils
*/
public static NamedList toNamedList(MetricRegistry registry, List<MetricFilter> shouldMatchFilters,
MetricFilter mustMatchFilter, boolean skipHistograms,
- boolean skipAggregateValues,
+ boolean skipAggregateValues, boolean compact,
Map<String, Object> metadata) {
- NamedList result = new NamedList();
+ NamedList result = new SimpleOrderedMap();
- toNamedMaps(registry, shouldMatchFilters, mustMatchFilter, skipHistograms, skipAggregateValues, (k, v) -> {
+ toMaps(registry, shouldMatchFilters, mustMatchFilter, skipHistograms, skipAggregateValues, compact, (k, v) -> {
- if (v instanceof Map) {
- result.add(k, new NamedList((Map)v));
- } else {
- result.add(k, v);
- }
+ result.add(k, v);
});
if (metadata != null && !metadata.isEmpty()) {
- result.add("_metadata_", new NamedList(metadata));
+ result.add("_metadata_", metadata);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a2c2f66/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index 0dcfbcd,2fd7e9c..81e14d9
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@@ -47,16 -49,15 +49,17 @@@ public class MetricsHandlerTest extend
assertNotNull(values.get("solr.node"));
NamedList nl = (NamedList) values.get("solr.core.collection1");
assertNotNull(nl);
- assertNotNull(nl.get("SEARCHER.new.errors")); // counter type
- assertNotNull(((Map) nl.get("SEARCHER.new.errors")).get("count"));
+ Object o = nl.get("SEARCHER.new.errors");
+ assertNotNull(o); // counter type
- assertTrue(o instanceof NamedList);
- assertNotNull(((NamedList) o).get("count"));
- assertEquals(0L, ((NamedList) nl.get("SEARCHER.new.errors")).get("count"));
++ assertTrue(o instanceof Map);
+ // response wasn't serialized so we get here whatever MetricUtils produced instead of NamedList
++ assertNotNull(((Map) o).get("count"));
+ assertEquals(0L, ((Map) nl.get("SEARCHER.new.errors")).get("count"));
nl = (NamedList) values.get("solr.node");
assertNotNull(nl.get("CONTAINER.cores.loaded")); // int gauge
- assertEquals(1, ((NamedList) nl.get("CONTAINER.cores.loaded")).get("value"));
+ assertEquals(1, ((Map) nl.get("CONTAINER.cores.loaded")).get("value"));
assertNotNull(nl.get("ADMIN./admin/authorization.clientErrors")); // timer type
- assertEquals(5, ((NamedList) nl.get("ADMIN./admin/authorization.clientErrors")).size());
+ assertEquals(5, ((Map) nl.get("ADMIN./admin/authorization.clientErrors")).size());
resp = new SolrQueryResponse();
handler.handleRequestBody(req(CommonParams.QT, "/admin/metrics", CommonParams.WT, "json", "group", "jvm,jetty"), resp);