You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2016/12/16 16:49:51 UTC
lucene-solr:branch_6x: SOLR-9712: block when maxWarmingSearchers is
exceeded instead of throwing exception, default to 1, remove from most configs
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x a11cdd2fd -> 0f4c5f0a7
SOLR-9712: block when maxWarmingSearchers is exceeded instead of throwing exception, default to 1, remove from most configs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0f4c5f0a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0f4c5f0a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0f4c5f0a
Branch: refs/heads/branch_6x
Commit: 0f4c5f0a732cb0df3a213d05dca8b7c477728154
Parents: a11cdd2
Author: yonik <yo...@apache.org>
Authored: Fri Dec 16 11:46:48 2016 -0500
Committer: yonik <yo...@apache.org>
Committed: Fri Dec 16 11:47:18 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 6 ++
.../solr/collection1/conf/solrconfig.xml | 5 --
solr/contrib/ltr/example/solrconfig.xml | 11 ---
.../solr/solrcloud/conf/solrconfig.xml | 11 ---
.../java/org/apache/solr/core/SolrConfig.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 84 +++++++++++---------
.../solr/collection1/conf/solrconfig_perf.xml | 1 -
.../org/apache/solr/search/TestRealTimeGet.java | 2 +-
.../apache/solr/search/TestStressLucene.java | 2 +-
.../apache/solr/search/TestStressRecovery.java | 2 +-
.../apache/solr/search/TestStressReorder.java | 5 +-
.../solr/search/TestStressUserVersions.java | 4 +-
.../apache/solr/search/TestStressVersions.java | 2 +-
.../example-DIH/solr/db/conf/solrconfig.xml | 11 ---
.../example-DIH/solr/mail/conf/solrconfig.xml | 11 ---
.../example-DIH/solr/rss/conf/solrconfig.xml | 11 ---
.../example-DIH/solr/solr/conf/solrconfig.xml | 11 ---
.../example-DIH/solr/tika/conf/solrconfig.xml | 11 ---
solr/example/files/conf/solrconfig.xml | 11 ---
.../basic_configs/conf/solrconfig.xml | 11 ---
.../conf/solrconfig.xml | 11 ---
.../conf/solrconfig.xml | 11 ---
.../solr/client/solrj/LargeVolumeTestBase.java | 3 +-
.../solr/client/solrj/SolrExampleTestBase.java | 1 -
.../java/org/apache/solr/SolrJettyTestBase.java | 2 -
25 files changed, 62 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cd76fb6..f7928c8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -58,6 +58,12 @@ Upgrade Notes
for a listing of highlight parameters annotated with which highlighters use them.
hl.useFastVectorHighlighter is now considered deprecated in lieu of hl.method=fastVector.
+* SOLR-9712: maxWarmingSearchers now defaults to 1, and more importantly commits will now block if this
+ limit is exceeded instead of throwing an exception (a good thing). Consequently there is no longer a
+ 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.
+
+
New Features
----------------------
* SOLR-9293: Solrj client support for hierarchical clusters and other topics
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
index 5e0e66c..6482286 100644
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
@@ -212,11 +212,6 @@
warming. -->
<useColdSearcher>false</useColdSearcher>
- <!-- Maximum number of searchers that may be warming in the background
- concurrently. An error is returned if this limit is exceeded. Recommend
- 1-2 for read-only slaves, higher for masters w/o cache warming. -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
<!--
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/contrib/ltr/example/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/example/solrconfig.xml b/solr/contrib/ltr/example/solrconfig.xml
index 55da6a4..1c66c49 100644
--- a/solr/contrib/ltr/example/solrconfig.xml
+++ b/solr/contrib/ltr/example/solrconfig.xml
@@ -609,17 +609,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
index 1eda53e..42ab056 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
@@ -606,17 +606,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>4</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index e5e25a1..bd98075 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -287,7 +287,7 @@ public class SolrConfig extends Config implements MapSerializable {
} else {
jmxConfig = new JmxConfiguration(false, null, null, null);
}
- maxWarmingSearchers = getInt("query/maxWarmingSearchers", Integer.MAX_VALUE);
+ maxWarmingSearchers = getInt("query/maxWarmingSearchers", 1);
slowQueryThresholdMillis = getInt("query/slowQueryThresholdMillis", -1);
for (SolrPluginInfo plugin : plugins) loadPluginInfo(plugin);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 602a4d6..0fbddce 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1868,51 +1868,57 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
// if it isn't necessary.
synchronized (searcherLock) {
- // see if we can return the current searcher
- if (_searcher!=null && !forceNew) {
- if (returnSearcher) {
- _searcher.incref();
- return _searcher;
- } else {
- return null;
+ for(;;) { // this loop is so w can retry in the event that we exceed maxWarmingSearchers
+ // see if we can return the current searcher
+ if (_searcher != null && !forceNew) {
+ if (returnSearcher) {
+ _searcher.incref();
+ return _searcher;
+ } else {
+ return null;
+ }
}
- }
- // check to see if we can wait for someone else's searcher to be set
- if (onDeckSearchers>0 && !forceNew && _searcher==null) {
- try {
- searcherLock.wait();
- } catch (InterruptedException e) {
- log.info(SolrException.toStr(e));
+ // check to see if we can wait for someone else's searcher to be set
+ if (onDeckSearchers > 0 && !forceNew && _searcher == null) {
+ try {
+ searcherLock.wait();
+ } catch (InterruptedException e) {
+ log.info(SolrException.toStr(e));
+ }
}
- }
- // check again: see if we can return right now
- if (_searcher!=null && !forceNew) {
- if (returnSearcher) {
- _searcher.incref();
- return _searcher;
- } else {
- return null;
+ // check again: see if we can return right now
+ if (_searcher != null && !forceNew) {
+ if (returnSearcher) {
+ _searcher.incref();
+ return _searcher;
+ } else {
+ return null;
+ }
}
- }
- // At this point, we know we need to open a new searcher...
- // first: increment count to signal other threads that we are
- // opening a new searcher.
- onDeckSearchers++;
- if (onDeckSearchers < 1) {
- // should never happen... just a sanity check
- log.error(logid+"ERROR!!! onDeckSearchers is " + onDeckSearchers);
- onDeckSearchers=1; // reset
- } else if (onDeckSearchers > maxWarmingSearchers) {
- onDeckSearchers--;
- String msg="Error opening new searcher. exceeded limit of maxWarmingSearchers="+maxWarmingSearchers + ", try again later.";
- log.warn(logid+""+ msg);
- // HTTP 503==service unavailable, or 409==Conflict
- throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE,msg);
- } else if (onDeckSearchers > 1) {
- log.warn(logid+"PERFORMANCE WARNING: Overlapping onDeckSearchers=" + onDeckSearchers);
+ // At this point, we know we need to open a new searcher...
+ // first: increment count to signal other threads that we are
+ // opening a new searcher.
+ onDeckSearchers++;
+ if (onDeckSearchers < 1) {
+ // should never happen... just a sanity check
+ log.error(logid + "ERROR!!! onDeckSearchers is " + onDeckSearchers);
+ onDeckSearchers = 1; // reset
+ } else if (onDeckSearchers > maxWarmingSearchers) {
+ onDeckSearchers--;
+ try {
+ searcherLock.wait();
+ } catch (InterruptedException e) {
+ log.info(SolrException.toStr(e));
+ }
+ continue; // go back to the top of the loop and retry
+ } else if (onDeckSearchers > 1) {
+ log.warn(logid + "PERFORMANCE WARNING: Overlapping onDeckSearchers=" + onDeckSearchers);
+ }
+
+ break; // I can now exit the loop and proceed to open a searcher
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
index 8bd2dbb..c0b297f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
@@ -57,7 +57,6 @@
<queryResultWindowSize>20</queryResultWindowSize>
<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
<useColdSearcher>false</useColdSearcher>
- <maxWarmingSearchers>2</maxWarmingSearchers>
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
index 51eaf34..28ecaa3 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
@@ -513,7 +513,7 @@ public class TestRealTimeGet extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads; // number of committers at a time...
// query variables
final int percentRealtimeQuery = 60;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java b/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
index 94cf300..779be43 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
@@ -55,7 +55,7 @@ public class TestStressLucene extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
final AtomicLong operations = new AtomicLong(100000); // number of query operations to perform in total
int nReadThreads = 5 + random().nextInt(25);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
index 412908d..b6ecc2e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressRecovery.java
@@ -70,7 +70,7 @@ public class TestStressRecovery extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 2 + random().nextInt(10); // fewer write threads to give recovery thread more of a chance
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 75;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
index 4415946..bce1d75 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressReorder.java
@@ -68,8 +68,7 @@ public class TestStressReorder extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
-
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 75;
final AtomicLong operations = new AtomicLong(50000); // number of query operations to perform in total
@@ -84,7 +83,7 @@ public class TestStressReorder extends TestRTGBase {
final int ndocs = 1;
int nWriteThreads = 2;
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 101;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
index e098ecc..4eea434 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java
@@ -74,7 +74,7 @@ public class TestStressUserVersions extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 75;
@@ -90,7 +90,7 @@ public class TestStressUserVersions extends TestRTGBase {
final int ndocs = 1;
int nWriteThreads = 2;
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 101;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
index d91a2cc..ed51ae5 100644
--- a/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
+++ b/solr/core/src/test/org/apache/solr/search/TestStressVersions.java
@@ -56,7 +56,7 @@ public class TestStressVersions extends TestRTGBase {
final int ndocs = 5 + (random().nextBoolean() ? random().nextInt(25) : random().nextInt(200));
int nWriteThreads = 5 + random().nextInt(25);
- final int maxConcurrentCommits = nWriteThreads; // number of committers at a time... it should be <= maxWarmingSearchers
+ final int maxConcurrentCommits = nWriteThreads;
// query variables
final int percentRealtimeQuery = 75;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index df4ad14..8dbc51c 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -581,17 +581,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 5155665..d2c8a36 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -584,17 +584,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 8eb8dad..4021b80 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -581,17 +581,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index f9b36d9..b9f83e3 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -581,17 +581,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index 00d6df6..12e6eea 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -584,17 +584,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 720be88..c6d6d0e 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -579,17 +579,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index 440a2f0..daeea62 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -599,17 +599,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index b3fd7b1..668c39d 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -599,17 +599,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 17aa971..c0e37b8 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -611,17 +611,6 @@
-->
<useColdSearcher>false</useColdSearcher>
- <!-- Max Warming Searchers
-
- Maximum number of searchers that may be warming in the
- background concurrently. An error is returned if this limit
- is exceeded.
-
- Recommend values of 1-2 for read-only slaves, higher for
- masters w/o cache warming.
- -->
- <maxWarmingSearchers>2</maxWarmingSearchers>
-
</query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
index b9d525c..8f43c33 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
@@ -60,7 +60,8 @@ public abstract class LargeVolumeTestBase extends SolrJettyTestBase
// some of the commits could have failed because maxWarmingSearchers exceeded,
// so do a final commit to make sure everything is visible.
- client.commit();
+ // This should no longer be true as of SOLR-9712 (Solr 6.4)
+ // client.commit();
query(threadCount * numdocs);
log.info("done");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
index ce762a0..114d8ed 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
@@ -38,7 +38,6 @@ abstract public class SolrExampleTestBase extends AbstractSolrTestCase {
@Override
public void setUp() throws Exception {
- ignoreException("maxWarmingSearchers");
super.setUp();
// this sets the property for jetty starting SolrDispatchFilter
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f4c5f0a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index f70c24d..47a2d94 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -109,8 +109,6 @@ abstract public class SolrJettyTestBase extends SolrTestCaseJ4
nodeProps.setProperty("coreRootDirectory", coresDir.toString());
nodeProps.setProperty("configSetBaseDir", solrHome);
- ignoreException("maxWarmingSearchers");
-
jetty = new JettySolrRunner(solrHome, nodeProps, jettyConfig);
jetty.start();
port = jetty.getLocalPort();