You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/12/27 16:48:37 UTC
svn commit: r1426230 - in /lucene/dev/trunk: dev-tools/maven/
dev-tools/maven/solr/core/src/java/ solr/ solr/core/
solr/core/src/java/org/apache/solr/handler/
solr/core/src/test/org/apache/solr/
solr/core/src/test/org/apache/solr/core/ solr/core/src/te...
Author: uschindler
Date: Thu Dec 27 15:48:37 2012
New Revision: 1426230
URL: http://svn.apache.org/viewvc?rev=1426230&view=rev
Log:
Revert SOLR-1972
Removed:
lucene/dev/trunk/solr/licenses/metrics-core-2.1.2.jar.sha1
lucene/dev/trunk/solr/licenses/metrics-core-LICENSE-ASL.txt
lucene/dev/trunk/solr/licenses/metrics-core-NOTICE.txt
Modified:
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/ivy.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Dec 27 15:48:37 2012
@@ -150,11 +150,6 @@
<version>13.0.1</version>
</dependency>
<dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template Thu Dec 27 15:48:37 2012
@@ -196,10 +196,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
- <dependency>
- <groupId>com.yammer.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}</sourceDirectory>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Dec 27 15:48:37 2012
@@ -83,10 +83,6 @@ New Features
- SOLR-4144: Replication using too much RAM. (yonik, Markus Jelsma)
- SOLR-4187: NPE on Directory release (Mark Miller, Markus Jelsma)
-* SOLR-1972: Add extra statistics to RequestHandlers - 5 & 15-minute reqs/sec
- rolling averages; median, 75th, 95th, 99th, 99.9th percentile request times
- (Alan Woodward, Shawn Heisey, Adrien Grand)
-
* SOLR-4051: Add <propertyWriter /> element to DIH's data-config.xml file,
allowing the user to specify the location, filename and Locale for
the "data-config.properties" file. Alternatively, users can specify their
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Thu Dec 27 15:48:37 2012
@@ -30,7 +30,6 @@
<dependency org="org.objenesis" name="objenesis" rev="1.2" transitive="false"/>
<dependency org="com.spatial4j" name="spatial4j" rev="0.3" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
- <dependency org="com.yammer.metrics" name="metrics-core" rev="2.1.2" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java Thu Dec 27 15:48:37 2012
@@ -17,11 +17,6 @@
package org.apache.solr.handler;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-import com.yammer.metrics.stats.Snapshot;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
@@ -35,34 +30,26 @@ import org.apache.solr.search.SyntaxErro
import org.apache.solr.util.SolrPluginUtils;
import java.net.URL;
-import java.util.concurrent.atomic.AtomicLong;
/**
*
*/
public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoMBean {
+ // statistics
+ // TODO: should we bother synchronizing these, or is an off-by-one error
+ // acceptable every million requests or so?
+ volatile long numRequests;
+ volatile long numErrors;
+ volatile long numTimeouts;
protected NamedList initArgs = null;
protected SolrParams defaults;
protected SolrParams appends;
protected SolrParams invariants;
- protected boolean httpCaching = true;
-
- // Statistics
- private static final AtomicLong handlerNumber = new AtomicLong();
- private final Counter numRequests;
- private final Counter numErrors;
- private final Counter numTimeouts;
- private final Timer requestTimes;
+ volatile long totalTime = 0;
long handlerStart = System.currentTimeMillis();
+ protected boolean httpCaching = true;
- public RequestHandlerBase() {
- String scope = new String("metrics-scope-" + handlerNumber.getAndIncrement());
- numRequests = Metrics.newCounter(RequestHandlerBase.class, "numRequests", scope);
- numErrors = Metrics.newCounter(RequestHandlerBase.class, "numErrors", scope);
- numTimeouts = Metrics.newCounter(RequestHandlerBase.class, "numTimeouts", scope);
- requestTimes = Metrics.newTimer(RequestHandlerBase.class, "requestTimes", scope);
- }
/**
* Initializes the {@link org.apache.solr.request.SolrRequestHandler} by creating three {@link org.apache.solr.common.params.SolrParams} named.
@@ -107,7 +94,7 @@ public abstract class RequestHandlerBase
public void init(NamedList args) {
initArgs = args;
- // Copied from StandardRequestHandler
+ // Copied from StandardRequestHandler
if( args != null ) {
Object o = args.get("defaults");
if (o != null && o instanceof NamedList) {
@@ -127,7 +114,6 @@ public abstract class RequestHandlerBase
Object caching = initArgs.get("httpCaching");
httpCaching = caching != null ? Boolean.parseBoolean(caching.toString()) : true;
}
-
}
public NamedList getInitArgs() {
@@ -138,8 +124,7 @@ public abstract class RequestHandlerBase
@Override
public void handleRequest(SolrQueryRequest req, SolrQueryResponse rsp) {
- numRequests.inc();
- TimerContext timer = requestTimes.time();
+ numRequests++;
try {
SolrPluginUtils.setDefaults(req,defaults,appends,invariants);
rsp.setHttpCaching(httpCaching);
@@ -150,7 +135,7 @@ public abstract class RequestHandlerBase
Object partialResults = header.get("partialResults");
boolean timedOut = partialResults == null ? false : (Boolean)partialResults;
if( timedOut ) {
- numTimeouts.inc();
+ numTimeouts++;
rsp.setHttpCaching(false);
}
}
@@ -171,12 +156,11 @@ public abstract class RequestHandlerBase
}
rsp.setException(e);
- numErrors.inc();
- }
- finally {
- timer.stop();
+ numErrors++;
}
+ totalTime += rsp.getEndTime() - req.getStartTime();
}
+
//////////////////////// SolrInfoMBeans methods //////////////////////
@@ -209,20 +193,12 @@ public abstract class RequestHandlerBase
public NamedList<Object> getStatistics() {
NamedList<Object> lst = new SimpleOrderedMap<Object>();
lst.add("handlerStart",handlerStart);
- lst.add("requests", numRequests.count());
- lst.add("errors", numErrors.count());
- lst.add("timeouts", numTimeouts.count());
- lst.add("totalTime",requestTimes.sum());
- lst.add("avgRequestsPerSecond", requestTimes.meanRate());
- lst.add("5minRateReqsPerSecond", requestTimes.fiveMinuteRate());
- lst.add("15minRateReqsPerSecond", requestTimes.fifteenMinuteRate());
- lst.add("avgTimePerRequest", requestTimes.mean());
- Snapshot snapshot = requestTimes.getSnapshot();
- lst.add("medianRequestTime", snapshot.getMedian());
- lst.add("75thPcRequestTime", snapshot.get75thPercentile());
- lst.add("95thPcRequestTime", snapshot.get95thPercentile());
- lst.add("99thPcRequestTime", snapshot.get99thPercentile());
- lst.add("999thPcRequestTime", snapshot.get999thPercentile());
+ lst.add("requests", numRequests);
+ lst.add("errors", numErrors);
+ lst.add("timeouts", numTimeouts);
+ lst.add("totalTime",totalTime);
+ lst.add("avgTimePerRequest", (float) totalTime / (float) this.numRequests);
+ lst.add("avgRequestsPerSecond", (float) numRequests*1000 / (float)(System.currentTimeMillis()-handlerStart));
return lst;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Thu Dec 27 15:48:37 2012
@@ -16,7 +16,6 @@
*/
package org.apache.solr;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.AbstractSolrTestCase;
@@ -37,9 +36,6 @@ import java.util.Properties;
*
* @since solr 1.4
*/
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class TestSolrCoreProperties extends LuceneTestCase {
private static final String CONF_DIR = "." + File.separator + "solr" + File.separator + "collection1" + File.separator + "conf" + File.separator;
JettySolrRunner solrJetty;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java Thu Dec 27 15:48:37 2012
@@ -18,7 +18,6 @@
package org.apache.solr.core;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.handler.StandardRequestHandler;
import org.apache.solr.request.SolrRequestHandler;
import org.junit.BeforeClass;
@@ -88,23 +87,4 @@ public class RequestHandlersTest extends
assertNull( core.getRequestHandler("/update/asdgadsgas" ) ); // prefix
}
-
- @Test
- public void testStatistics() {
- SolrCore core = h.getCore();
- SolrRequestHandler updateHandler = core.getRequestHandler("/update");
- SolrRequestHandler termHandler = core.getRequestHandler("/terms");
-
- assertU(adoc("id", "47",
- "text", "line up and fly directly at the enemy death cannons, clogging them with wreckage!"));
- assertU(commit());
-
- NamedList updateStats = updateHandler.getStatistics();
- NamedList termStats = termHandler.getStatistics();
-
- Double updateTime = (Double) updateStats.get("totalTime");
- Double termTime = (Double) termStats.get("totalTime");
-
- assertFalse("RequestHandlers should not share statistics!", updateTime.equals(termTime));
- }
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java Thu Dec 27 15:48:37 2012
@@ -17,13 +17,11 @@
package org.apache.solr.core;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import junit.framework.Assert;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
import org.apache.lucene.analysis.ngram.NGramFilterFactory;
-import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.common.SolrException;
import org.apache.solr.handler.admin.LukeRequestHandler;
import org.apache.solr.handler.component.FacetComponent;
@@ -37,9 +35,6 @@ import java.nio.charset.CharacterCodingE
import java.util.Arrays;
import java.util.List;
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class ResourceLoaderTest extends LuceneTestCase
{
public void testInstanceDir() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Thu Dec 27 15:48:37 2012
@@ -16,32 +16,26 @@
*/
package org.apache.solr.schema;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+
import org.apache.commons.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.beans.Field;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.*;
import org.apache.solr.core.SolrResourceLoader;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.ByteBuffer;
-import java.util.List;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class TestBinaryField extends LuceneTestCase {
HttpSolrServer server;
JettySolrRunner jetty;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Thu Dec 27 15:48:37 2012
@@ -17,11 +17,12 @@
package org.apache.solr.client.solrj.embedded;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import java.io.File;
+import java.net.URL;
+import java.util.Random;
+
import org.apache.commons.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.util.ExternalPaths;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
@@ -32,18 +33,12 @@ import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import java.io.File;
-import java.net.URL;
-import java.util.Random;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
/**
*
* @since solr 1.3
*/
-
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class JettyWebappTest extends LuceneTestCase
{
int port = 0;
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java Thu Dec 27 15:48:37 2012
@@ -23,7 +23,6 @@ import java.util.List;
import junit.framework.Assert;
-import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.core.SolrCore;
import org.junit.Rule;
import org.junit.rules.RuleChain;
@@ -32,11 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class TestEmbeddedSolrServer extends AbstractEmbeddedSolrServerTestCase {
@Rule
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Thu Dec 27 15:48:37 2012
@@ -17,17 +17,20 @@
package org.apache.solr.client.solrj.embedded;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.*;
+
import org.apache.commons.io.IOUtils;
-import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
-import org.apache.solr.client.solrj.request.CoreAdminRequest;
-import org.apache.solr.client.solrj.request.QueryRequest;
-import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.request.*;
import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.core.CoreContainer;
@@ -43,23 +46,12 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
/**
*
* @since solr 1.3
*/
-@ThreadLeakFilters(defaultFilters = true, filters = {
- SolrIgnoredThreadsFilter.class
-})
public class TestSolrProperties extends AbstractEmbeddedSolrServerTestCase {
protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java?rev=1426230&r1=1426229&r2=1426230&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java Thu Dec 27 15:48:37 2012
@@ -42,8 +42,7 @@ public class SolrIgnoredThreadsFilter im
return true;
}
- if (threadName.startsWith("facetExecutor-") ||
- threadName.startsWith("metrics-") ||
+ if (threadName.startsWith("facetExecutor-") ||
threadName.startsWith("cmdDistribExecutor-") ||
threadName.startsWith("httpShardExecutor-")) {
return true;