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 16:11:31 UTC
[2/3] lucene-solr:branch_6x: SOLR-10109: Capture 'free' commits and
improve a couple timeouts.
SOLR-10109: Capture 'free' commits and improve a couple timeouts.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8d8ed80a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8d8ed80a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8d8ed80a
Branch: refs/heads/branch_6x
Commit: 8d8ed80a3267d6f6274ea52c2e40e78e9796d8bc
Parents: 86973ca
Author: markrmiller <ma...@apache.org>
Authored: Thu Feb 9 19:22:25 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:09:07 2017 -0500
----------------------------------------------------------------------
.../test/org/apache/solr/update/SoftAutoCommitTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d8ed80a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
index c4f5dee..261a44b 100644
--- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
@@ -258,7 +258,7 @@ public class SoftAutoCommitTest extends AbstractSolrTestCase {
monitor.assertSaneOffers();
// Wait for the soft commit with some fudge
- soft529 = monitor.soft.poll(softCommitWaitMillis * 3000, MILLISECONDS);
+ soft529 = monitor.soft.poll(softCommitWaitMillis * 5, MILLISECONDS);
assertNotNull("soft529 wasn't fast enough", soft529);
monitor.assertSaneOffers();
@@ -271,7 +271,7 @@ public class SoftAutoCommitTest extends AbstractSolrTestCase {
assertU(adoc("id", "550", "subject", "just for noise/activity"));
// wait for the hard commit
- hard529 = monitor.hard.poll(hardCommitWaitMillis * 3, MILLISECONDS);
+ hard529 = monitor.hard.poll(hardCommitWaitMillis * 5, MILLISECONDS);
assertNotNull("hard529 wasn't fast enough", hard529);
monitor.assertSaneOffers();
@@ -296,9 +296,13 @@ public class SoftAutoCommitTest extends AbstractSolrTestCase {
searcher529 + " !<= " + hard529,
searcher529 <= hard529);
- // wait for the last searcher we triggerd with 550
+ // ensure we wait for the last searcher we triggered with 550
monitor.searcher.poll(5000, MILLISECONDS);
+ // ensure we wait for the commits on 550
+ monitor.hard.poll(5000, MILLISECONDS);
+ monitor.soft.poll(5000, MILLISECONDS);
+
// clear commits
monitor.hard.clear();
monitor.soft.clear();