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 12:11:08 UTC
[1/5] lucene-solr:branch_7x: SOLR-12801: Harden TestCloudRecovery.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 995547d29 -> 2e6bf936a
SOLR-12801: Harden TestCloudRecovery.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b1a8553f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b1a8553f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b1a8553f
Branch: refs/heads/branch_7x
Commit: b1a8553fa8e1053d873faa294ed64cb6c1471bca
Parents: 85cfc88
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 05:42:01 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 05:42:08 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/solr/update/UpdateLog.java | 2 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 41 ++++++++++++++++++--
2 files changed, 38 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1a8553f/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 0941da5..612bc6e 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -1539,7 +1539,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
numUpdates++;
}
- } catch (IOException e) {
+ } catch (IOException | AssertionError e) { // catch AssertionError to handle certain test failures correctly
// failure to read a log record isn't fatal
log.error("Exception reading versions from log",e);
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1a8553f/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
index e2bb5db..3b883e0 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
@@ -17,13 +17,14 @@
package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
@@ -38,10 +39,12 @@ import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.update.DirectUpdateHandler2;
+import org.apache.solr.util.DefaultSolrThreadFactory;
import org.apache.solr.util.RTimer;
import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
@@ -585,15 +588,45 @@ public class ChaosMonkey {
}
public static void stop(List<JettySolrRunner> jettys) throws Exception {
+ ExecutorService executor = new ExecutorUtil.MDCAwareThreadPoolExecutor(
+ 0,
+ Integer.MAX_VALUE,
+ 15, TimeUnit.SECONDS,
+ new SynchronousQueue<>(),
+ new DefaultSolrThreadFactory("ChaosMonkey"),
+ false);
for (JettySolrRunner jetty : jettys) {
- jetty.stop();
+ executor.submit(() -> {
+ try {
+ jetty.stop();
+ } catch (Exception e) {
+ log.error("error stopping jetty", e);
+ throw new RuntimeException(e);
+ }
+ });
}
+ ExecutorUtil.shutdownAndAwaitTermination(executor);
}
-
+
public static void start(List<JettySolrRunner> jettys) throws Exception {
+ ExecutorService executor = new ExecutorUtil.MDCAwareThreadPoolExecutor(
+ 0,
+ Integer.MAX_VALUE,
+ 15, TimeUnit.SECONDS,
+ new SynchronousQueue<>(),
+ new DefaultSolrThreadFactory("ChaosMonkey"),
+ false);
for (JettySolrRunner jetty : jettys) {
- jetty.start();
+ executor.submit(() -> {
+ try {
+ jetty.start();
+ } catch (Exception e) {
+ log.error("error starting jetty", e);
+ throw new RuntimeException(e);
+ }
+ });
}
+ ExecutorUtil.shutdownAndAwaitTermination(executor);
}
/**
[5/5] lucene-solr:branch_7x: SOLR-12801: Add @AwaitsFix to
TestHierarchicalDocBuilder#testThreeLevelHierarchy.
Posted by ma...@apache.org.
SOLR-12801: Add @AwaitsFix to TestHierarchicalDocBuilder#testThreeLevelHierarchy.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2e6bf936
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e6bf936
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e6bf936
Branch: refs/heads/branch_7x
Commit: 2e6bf936ae6778c3355cad26f3fdc7d2de0251fe
Parents: b1a8553
Author: markrmiller <ma...@apache.org>
Authored: Tue Dec 11 06:05:26 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 06:10:57 2018 -0600
----------------------------------------------------------------------
.../apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e6bf936/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
index 103d0dc..eb62192 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
@@ -108,6 +108,7 @@ public class TestHierarchicalDocBuilder extends AbstractDataImportHandlerTestCas
}
@Test
+ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12801") // this test fails easily under beasting
public void testThreeLevelHierarchy() throws Exception {
int parentsNum = 3; //fixed for simplicity of test
int childrenNum = 0;
[2/5] lucene-solr:branch_7x: SOLR-12801: Raise this test socket
timeout to 30 seconds.
Posted by ma...@apache.org.
SOLR-12801: Raise this test socket timeout to 30 seconds.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/85cfc886
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/85cfc886
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/85cfc886
Branch: refs/heads/branch_7x
Commit: 85cfc8861c696e38a043cb668f2830577e6f137c
Parents: 44ffa9b
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 10 22:58:16 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 05:42:08 2018 -0600
----------------------------------------------------------------------
solr/core/src/test-files/solr/solr.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/85cfc886/solr/core/src/test-files/solr/solr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xml
index 2c13448..f77c9c4 100644
--- a/solr/core/src/test-files/solr/solr.xml
+++ b/solr/core/src/test-files/solr/solr.xml
@@ -45,7 +45,7 @@
<int name="leaderVoteWait">${leaderVoteWait:15000}</int> <!-- We are running tests - the default should be low, not like production -->
<int name="leaderConflictResolveWait">${leaderConflictResolveWait:45000}</int>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:5000}</int>
- <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:15000}</int> <!-- We are running tests - the default should be low, not like production -->
+ <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:30000}</int> <!-- We are running tests - the default should be low, not like production -->
<int name="autoReplicaFailoverWaitAfterExpiration">${autoReplicaFailoverWaitAfterExpiration:10000}</int>
<int name="autoReplicaFailoverWorkLoopDelay">${autoReplicaFailoverWorkLoopDelay:10000}</int>
<int name="autoReplicaFailoverBadNodeExpiration">${autoReplicaFailoverBadNodeExpiration:60000}</int>
[3/5] lucene-solr:branch_7x: SOLR-12801: Harden
BasicDistributedZk2Test.
Posted by ma...@apache.org.
SOLR-12801: Harden BasicDistributedZk2Test.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3bc5dbce
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3bc5dbce
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3bc5dbce
Branch: refs/heads/branch_7x
Commit: 3bc5dbce0122c3c99b3c4c50441a813bc5cd25c3
Parents: 995547d
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 10 21:25:06 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 05:42:08 2018 -0600
----------------------------------------------------------------------
.../org/apache/solr/cloud/BasicDistributedZk2Test.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3bc5dbce/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 5091eaf..8b5d15c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -293,9 +293,17 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
long numFound1 = cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound();
cloudClient.getZkStateReader().getLeaderRetry(DEFAULT_COLLECTION, SHARD1, 60000);
- index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
- "specific doc!");
+ try {
+ index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
+ "specific doc!");
+ } catch (Exception e) {
+ // wait and try again
+ Thread.sleep(4000);
+ index_specific(shardToJetty.get(SHARD1).get(1).client.solrClient, id, 1000, i1, 108, t1,
+ "specific doc!");
+ }
+
commit();
checkShardConsistency(true, false);
[4/5] lucene-solr:branch_7x: 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/44ffa9be
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/44ffa9be
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/44ffa9be
Branch: refs/heads/branch_7x
Commit: 44ffa9be667bf7a7876f296a6f59783ef6a9110c
Parents: 3bc5dbc
Author: markrmiller <ma...@apache.org>
Authored: Mon Dec 10 22:47:22 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Tue Dec 11 05:42:08 2018 -0600
----------------------------------------------------------------------
.../solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/44ffa9be/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 8314b8d..d685ef6 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
@@ -739,7 +739,7 @@ public class TestSimTriggerIntegration extends SimSolrCloudTestCase {
cluster.getTimeSource().sleep(10000);
// kill overseer
cluster.simRestartOverseer(null);
- await = triggerFiredLatch.await(20000 / SPEED, TimeUnit.MILLISECONDS);
+ await = triggerFiredLatch.await(60000 / SPEED, TimeUnit.MILLISECONDS);
assertTrue("The trigger did not fire at all", await);
assertTrue(triggerFired.get());
}