You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/10/27 18:52:04 UTC
svn commit: r1634621 - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/core/
core/src/java/org/apache/solr/update/processor/
example/solr/collection1/conf/
Author: thelabdude
Date: Mon Oct 27 17:52:04 2014
New Revision: 1634621
URL: http://svn.apache.org/r1634621
Log:
SOLR-6650: disabled by default
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1634621&r1=1634620&r2=1634621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java Mon Oct 27 17:52:04 2014
@@ -241,7 +241,7 @@ public class SolrConfig extends Config {
jmxConfig = new JmxConfiguration(false, null, null, null);
}
maxWarmingSearchers = getInt("query/maxWarmingSearchers",Integer.MAX_VALUE);
- slowQueryThresholdMillis = getInt("query/slowQueryThresholdMillis", 1000);
+ slowQueryThresholdMillis = getInt("query/slowQueryThresholdMillis", -1);
loadPluginInfo(SolrRequestHandler.class,"requestHandler",
REQUIRE_NAME, REQUIRE_CLASS, MULTI_OK);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1634621&r1=1634620&r2=1634621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Mon Oct 27 17:52:04 2014
@@ -666,7 +666,7 @@ public final class SolrCore implements S
this.solrConfig = null;
this.startTime = System.currentTimeMillis();
this.maxWarmingSearchers = 2; // we don't have a config yet, just pick a number.
- this.slowQueryThresholdMillis = 1000;
+ this.slowQueryThresholdMillis = -1;
this.resourceLoader = null;
this.updateHandler = null;
this.isReloaded = true;
@@ -1989,10 +1989,12 @@ public final class SolrCore implements S
if (rsp.getToLog().size() > 0) {
if (log.isInfoEnabled()) {
log.info(rsp.getToLogAsString(logid));
- } else if (log.isWarnEnabled()) {
+ }
+
+ if (log.isWarnEnabled()) {
final int qtime = (int)(rsp.getEndTime() - req.getStartTime());
- if (qtime >= slowQueryThresholdMillis) {
- log.warn(rsp.getToLogAsString(logid));
+ if (slowQueryThresholdMillis >= 0 && qtime >= slowQueryThresholdMillis) {
+ log.warn("slow: " + rsp.getToLogAsString(logid));
}
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=1634621&r1=1634620&r2=1634621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Mon Oct 27 17:52:04 2014
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
public class LogUpdateProcessorFactory extends UpdateRequestProcessorFactory implements UpdateRequestProcessorFactory.RunAlways {
int maxNumToLog = 10;
- int slowUpdateThresholdMillis = 1000;
+ int slowUpdateThresholdMillis = -1;
@Override
public void init( final NamedList args ) {
if( args != null ) {
@@ -186,10 +186,12 @@ class LogUpdateProcessor extends UpdateR
if (log.isInfoEnabled()) {
log.info(getLogStringAndClearRspToLog());
- } else if (log.isWarnEnabled()) {
+ }
+
+ if (log.isWarnEnabled()) {
long elapsed = rsp.getEndTime() - req.getStartTime();
- if (elapsed >= slowUpdateThresholdMillis) {
- log.warn(getLogStringAndClearRspToLog());
+ if (slowUpdateThresholdMillis >= 0 && elapsed >= slowUpdateThresholdMillis) {
+ log.warn("slow: " + getLogStringAndClearRspToLog());
}
}
}
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml?rev=1634621&r1=1634620&r2=1634621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Mon Oct 27 17:52:04 2014
@@ -489,12 +489,8 @@
useful to be able to set a latency threshold above which a request
is considered "slow" and log that request at WARN level so we can
easily identify slow queries.
-
- This setting only applies if the logger for the
- org.apache.solr.core.SolrCore is set to WARN or greater.
-
-->
- <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
+ <slowQueryThresholdMillis>-1</slowQueryThresholdMillis>
<!-- Solr Internal Query Caches