You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2017/05/04 15:30:28 UTC
lucene-solr:branch_6x: SOLR-9867: fixing JvmMetricsTest broken
earlier, bring back testTechproductsExample() and single SDF.cores assignment.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 491d8c1a5 -> b59f816e6
SOLR-9867: fixing JvmMetricsTest broken earlier, bring back testTechproductsExample()
and single SDF.cores assignment.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b59f816e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b59f816e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b59f816e
Branch: refs/heads/branch_6x
Commit: b59f816e6204e59dbb9bfde464032cabb8ba0d50
Parents: 491d8c1
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Thu May 4 17:18:24 2017 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Thu May 4 18:28:34 2017 +0300
----------------------------------------------------------------------
.../org/apache/solr/servlet/SolrDispatchFilter.java | 12 ++++++------
.../org/apache/solr/util/TestSolrCLIRunExample.java | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b59f816e/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 086ea5b..80f3000 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -170,7 +170,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
coresInit = createCoreContainer(solrHome == null ? SolrResourceLoader.locateSolrHome() : Paths.get(solrHome),
extraProperties);
this.httpClient = coresInit.getUpdateShardHandler().getHttpClient();
- setupJvmMetrics();
+ setupJvmMetrics(coresInit);
log.debug("user.dir=" + System.getProperty("user.dir"));
}
catch( Throwable t ) {
@@ -188,8 +188,8 @@ public class SolrDispatchFilter extends BaseSolrFilter {
}
}
- private void setupJvmMetrics() {
- SolrMetricManager metricManager = cores.getMetricManager();
+ private void setupJvmMetrics(CoreContainer coresInit) {
+ SolrMetricManager metricManager = coresInit.getMetricManager();
try {
String registry = SolrMetricManager.getRegistryName(SolrInfoMBean.Group.jvm);
metricManager.registerAll(registry, new AltBufferPoolMetricSet(), true, "buffers");
@@ -236,9 +236,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
*/
protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
NodeConfig nodeConfig = loadNodeConfig(solrHome, extraProperties);
- cores = new CoreContainer(nodeConfig, extraProperties, true);
- cores.load();
- return cores;
+ final CoreContainer coreContainer = new CoreContainer(nodeConfig, extraProperties, true);
+ coreContainer.load();
+ return coreContainer;
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b59f816e/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index 86790c8..6bce8226 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -50,7 +50,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -297,7 +296,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
closeables = null;
}
}
- @Ignore
+
@Test
public void testTechproductsExample() throws Exception {
testExample("techproducts");