Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9849: Use a very low value for solr.cloud.wait-for-updates-with-stale-state-pause in tests.

This commit is contained in:
markrmiller 2017-02-22 09:52:51 -05:00
parent f2f8154d0b
commit b28dc3fe34
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
View File

@ -43,8 +43,6 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
public static void beforeTests() { public static void beforeTests() {
System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(MAX_BUFFERED_DOCS)); System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(MAX_BUFFERED_DOCS));
System.setProperty("solr.ulog.numRecordsToKeep", String.valueOf(ULOG_NUM_RECORDS_TO_KEEP)); System.setProperty("solr.ulog.numRecordsToKeep", String.valueOf(ULOG_NUM_RECORDS_TO_KEEP));
// the default=7000ms artificially slows down recovery and is not needed for this test
System.setProperty("solr.cloud.wait-for-updates-with-stale-state-pause", "500");
// avoid creating too many files, see SOLR-7421 // avoid creating too many files, see SOLR-7421
System.setProperty("useCompoundFile", "true"); System.setProperty("useCompoundFile", "true");
} }
@ -53,7 +51,6 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
public static void afterTest() { public static void afterTest() {
System.clearProperty("solr.tests.maxBufferedDocs"); System.clearProperty("solr.tests.maxBufferedDocs");
System.clearProperty("solr.ulog.numRecordsToKeep"); System.clearProperty("solr.ulog.numRecordsToKeep");
System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");
System.clearProperty("useCompoundFile"); System.clearProperty("useCompoundFile");
} }

3
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
View File

@ -274,6 +274,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong())); System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
System.setProperty("solr.clustering.enabled", "false"); System.setProperty("solr.clustering.enabled", "false");
System.setProperty("solr.peerSync.useRangeVersions", String.valueOf(random().nextBoolean())); System.setProperty("solr.peerSync.useRangeVersions", String.valueOf(random().nextBoolean()));
System.setProperty("solr.cloud.wait-for-updates-with-stale-state-pause", "500");
startTrackingSearchers(); startTrackingSearchers();
ignoreException("ignore_exception"); ignoreException("ignore_exception");
newRandomConfig(); newRandomConfig();
@ -322,7 +323,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
System.clearProperty("useCompoundFile"); System.clearProperty("useCompoundFile");
System.clearProperty("urlScheme"); System.clearProperty("urlScheme");
System.clearProperty("solr.peerSync.useRangeVersions"); System.clearProperty("solr.peerSync.useRangeVersions");
System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");
HttpClientUtil.resetHttpClientBuilder(); HttpClientUtil.resetHttpClientBuilder();
// clean up static // clean up static