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/11 14:58:54 UTC
[1/5] lucene-solr:master: SOLR-12801: Try to harden CdcrBootstrapTest.
Repository: lucene-solr
Updated Branches:
refs/heads/master 874937aba -> 274a6eba9
SOLR-12801: Try to harden CdcrBootstrapTest.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/274a6eba
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/274a6eba
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/274a6eba
Branch: refs/heads/master
Commit: 274a6eba901e1181ace413003e31e3ae888ffc8c
Parents: 19d968d
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 08:43:08 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 08:58:42 2018 -0600
----------------------------------------------------------------------
.../src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/274a6eba/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java
index cc3f6ed..87a475b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/cdcr/CdcrBootstrapTest.java
@@ -114,7 +114,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
target.waitForActiveCollection("cdcr-target", 1, 2);
CloudSolrClient targetSolrClient = target.getSolrClient();
targetSolrClient.setDefaultCollection("cdcr-target");
- Thread.sleep(3000);
+ Thread.sleep(6000);
CdcrTestsUtil.cdcrStart(targetSolrClient);
CdcrTestsUtil.cdcrStart(sourceSolrClient);
[3/5] lucene-solr:master: SOLR-12801: Harden
InfixSuggestersTest#testShutdownDuringBuild.
Posted by ma...@apache.org.
SOLR-12801: Harden InfixSuggestersTest#testShutdownDuringBuild.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a25ddcd4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a25ddcd4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a25ddcd4
Branch: refs/heads/master
Commit: a25ddcd4f3df0f09509d1b36f843e5530b57b342
Parents: 874937a
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 06:35:19 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 08:58:42 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/handler/component/InfixSuggestersTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a25ddcd4/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
index 7971bf0..b1b02e1 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/InfixSuggestersTest.java
@@ -122,7 +122,7 @@ public class InfixSuggestersTest extends SolrTestCaseJ4 {
try {
LinkedHashMap<Class<? extends Throwable>, List<Class<? extends Throwable>>> expected = new LinkedHashMap<>();
expected.put(RuntimeException.class, Arrays.asList
- (SolrCoreState.CoreIsClosedException.class, SolrException.class, IllegalStateException.class));
+ (SolrCoreState.CoreIsClosedException.class, SolrException.class, IllegalStateException.class, NullPointerException.class));
final Throwable[] outerException = new Throwable[1];
// Build the suggester in the background with a long dictionary
Future job = executor.submit(() -> outerException[0] = expectThrowsAnyOf(expected,
[5/5] lucene-solr:master: SOLR-12923: Harden TestSimLargeCluster.
Posted by ma...@apache.org.
SOLR-12923: Harden TestSimLargeCluster.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eb1735ec
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb1735ec
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb1735ec
Branch: refs/heads/master
Commit: eb1735ece90e0a4d04b21b5908a409c6e929b935
Parents: a25ddcd
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 07:07:01 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 08:58:42 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb1735ec/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java
index bc4c598..8e34255 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimLargeCluster.java
@@ -697,7 +697,7 @@ public class TestSimLargeCluster extends SimSolrCloudTestCase {
boolean await = triggerFinishedLatch.await(waitForSeconds * 45000 / SPEED, TimeUnit.MILLISECONDS);
assertTrue("The trigger did not fire at all", await);
// wait for listener to capture the SUCCEEDED stage
- cluster.getTimeSource().sleep(15000);
+ cluster.getTimeSource().sleep(25000);
assertNotNull(listenerEvents.entrySet().toString(), listenerEvents.get("srt"));
[4/5] lucene-solr:master: SOLR-12801: Harden OverseerTaskQueueTest
and DistributedQueueTest.
Posted by ma...@apache.org.
SOLR-12801: Harden OverseerTaskQueueTest and DistributedQueueTest.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/19d968dc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/19d968dc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/19d968dc
Branch: refs/heads/master
Commit: 19d968dc3d9b239657d6efc69f5866fb843bac59
Parents: b9278d7
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 08:35:27 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 08:58:42 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/cloud/DistributedQueueTest.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19d968dc/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
index 2a89acd..c67f79e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
@@ -29,6 +29,8 @@ import org.apache.solr.client.solrj.cloud.DistributedQueue;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrjNamedThreadFactory;
+import org.apache.solr.common.util.TimeSource;
+import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -143,6 +145,16 @@ public class DistributedQueueTest extends SolrTestCaseJ4 {
// After draining the queue, a watcher should be set.
assertNull(dq.peek(100));
+
+ TimeOut timeout = new TimeOut(30, TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ timeout.waitFor("Timeout waiting to see dirty=false", () -> {
+ try {
+ return !dq.isDirty();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ });
+
assertFalse(dq.isDirty());
assertEquals(1, dq.watcherCount());
[2/5] lucene-solr:master: SOLR-12923: Harden
TestSimTriggerIntegration.
Posted by ma...@apache.org.
SOLR-12923: Harden TestSimTriggerIntegration.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b9278d7c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b9278d7c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b9278d7c
Branch: refs/heads/master
Commit: b9278d7c99d172b0f197946490dc95958551fa78
Parents: eb1735e
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 07:10:01 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 08:58:42 2018 -0600
----------------------------------------------------------------------
.../cloud/autoscaling/sim/TestSimTriggerIntegration.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b9278d7c/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
index af54815..c8b6528 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
@@ -210,7 +210,7 @@ public class TestSimTriggerIntegration extends SimSolrCloudTestCase {
String newNode = cluster.simAddNode();
- if (!triggerFiredLatch.await(320000 / SPEED, TimeUnit.MILLISECONDS)) {
+ if (!triggerFiredLatch.await(420000 / SPEED, TimeUnit.MILLISECONDS)) {
fail("Both triggers should have fired by now");
}
@@ -436,7 +436,7 @@ public class TestSimTriggerIntegration extends SimSolrCloudTestCase {
}
String newNode = cluster.simAddNode();
- boolean await = triggerFiredLatch.await(90000 / SPEED, TimeUnit.MILLISECONDS);
+ boolean await = triggerFiredLatch.await(240000 / SPEED, TimeUnit.MILLISECONDS);
assertTrue("The trigger did not fire at all", await);
assertTrue(triggerFired.get());
TriggerEvent nodeAddedEvent = events.iterator().next();
@@ -922,7 +922,7 @@ public class TestSimTriggerIntegration extends SimSolrCloudTestCase {
}
- if (!triggerFiredLatch.await(60000 / SPEED, TimeUnit.MILLISECONDS)) {
+ if (!triggerFiredLatch.await(120000 / SPEED, TimeUnit.MILLISECONDS)) {
fail("Trigger should have fired by now");
}
assertEquals(1, events.size());
@@ -1184,7 +1184,7 @@ public class TestSimTriggerIntegration extends SimSolrCloudTestCase {
await = triggerFiredLatch.await(20000 / SPEED, TimeUnit.MILLISECONDS);
assertTrue("The trigger did not fire at all", await);
// wait for listener to capture the SUCCEEDED stage
- cluster.getTimeSource().sleep(6000);
+ cluster.getTimeSource().sleep(8000);
// there must be exactly one SUCCEEDED event
capturedEvents = listenerEvents.get("bar");