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 2018/12/01 19:03:03 UTC
lucene-solr:master: SOLR-12801: Don't possibly block forever in this
test in remaining spots.
Repository: lucene-solr
Updated Branches:
refs/heads/master b294d8460 -> e5281ef3d
SOLR-12801: Don't possibly block forever in this test in remaining spots.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e5281ef3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e5281ef3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e5281ef3
Branch: refs/heads/master
Commit: e5281ef3d5e36f5ad8a871818dd511fb9fbee74f
Parents: b294d84
Author: markrmiller <ma...@apache.org>
Authored: Sat Dec 1 13:02:51 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Sat Dec 1 13:02:58 2018 -0600
----------------------------------------------------------------------
.../solr/cloud/autoscaling/sim/TestSimDistributedQueue.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e5281ef3/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
index a997571..00926f3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
@@ -65,7 +65,7 @@ public class TestSimDistributedQueue extends SolrTestCaseJ4 {
assertNull(dq.poll());
dq.offer(data);
- dq.peek(true); // wait until data is definitely there before calling remove
+ dq.peek(15000); // wait until data is definitely there before calling remove
assertArrayEquals(dq.remove(), data);
assertNull(dq.poll());
@@ -90,7 +90,7 @@ public class TestSimDistributedQueue extends SolrTestCaseJ4 {
DistributedQueue dq = makeDistributedQueue(dqZNode);
assertNull(dq.peek());
- Future<String> future = executor.submit(() -> new String(dq.peek(true), UTF8));
+ Future<String> future = executor.submit(() -> new String(dq.peek(15000), UTF8));
try {
future.get(1000, TimeUnit.MILLISECONDS);
fail("TimeoutException expected");