You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/02/22 15:24:46 UTC
[2/5] lucene-solr:branch_6x: SOLR-9849: Use a very low value for
solr.cloud.wait-for-updates-with-stale-state-pause in tests.
SOLR-9849: Use a very low value for solr.cloud.wait-for-updates-with-stale-state-pause in tests.
# Conflicts:
# solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/42cb1774
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/42cb1774
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/42cb1774
Branch: refs/heads/branch_6x
Commit: 42cb1774cba7fe46b28c939132de5f45ffbddddb
Parents: 6f9079e
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 22 09:52:51 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 10:16:34 2017 -0500
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java | 3 ---
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/42cb1774/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
index ba40758..c987c90 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
@@ -43,8 +43,6 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
public static void beforeTests() {
System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(MAX_BUFFERED_DOCS));
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
System.setProperty("useCompoundFile", "true");
}
@@ -53,7 +51,6 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
public static void afterTest() {
System.clearProperty("solr.tests.maxBufferedDocs");
System.clearProperty("solr.ulog.numRecordsToKeep");
- System.clearProperty("solr.cloud.wait-for-updates-with-stale-state-pause");
System.clearProperty("useCompoundFile");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/42cb1774/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 84a71a2..fa1308b 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -274,6 +274,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
System.setProperty("solr.clustering.enabled", "false");
System.setProperty("solr.peerSync.useRangeVersions", String.valueOf(random().nextBoolean()));
+ System.setProperty("solr.cloud.wait-for-updates-with-stale-state-pause", "500");
startTrackingSearchers();
ignoreException("ignore_exception");
newRandomConfig();
@@ -322,7 +323,6 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
System.clearProperty("useCompoundFile");
System.clearProperty("urlScheme");
System.clearProperty("solr.peerSync.useRangeVersions");
-
HttpClientUtil.resetConfigurers();
// clean up static