You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/07/05 21:01:42 UTC
lucene-solr:master: SOLR-11015: Use a higher socket timeout for
creating testcollection in ChaosMonkeyNothingIsSafe*
Repository: lucene-solr
Updated Branches:
refs/heads/master 7c704d525 -> 16a1a6f76
SOLR-11015: Use a higher socket timeout for creating testcollection in ChaosMonkeyNothingIsSafe*
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/16a1a6f7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/16a1a6f7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/16a1a6f7
Branch: refs/heads/master
Commit: 16a1a6f76ff388cbf336c85d87324815cf21b24b
Parents: 7c704d5
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Wed Jul 5 14:01:24 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Wed Jul 5 14:01:24 2017 -0700
----------------------------------------------------------------------
.../org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 8 ++++++--
.../cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16a1a6f7/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index 522f4dd..f8a1362 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -102,7 +102,11 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
@Override
protected CloudSolrClient createCloudClient(String defaultCollection) {
- CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), random().nextBoolean(), 30000, clientSoTimeout);
+ return this.createCloudClient(defaultCollection, this.clientSoTimeout);
+ }
+
+ protected CloudSolrClient createCloudClient(String defaultCollection, int socketTimeout) {
+ CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), random().nextBoolean(), 30000, socketTimeout);
client.setParallelUpdates(random().nextBoolean());
if (defaultCollection != null) client.setDefaultCollection(defaultCollection);
return client;
@@ -250,7 +254,7 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
restartZk(1000 * (5 + random().nextInt(4)));
}
- try (CloudSolrClient client = createCloudClient("collection1")) {
+ try (CloudSolrClient client = createCloudClient("collection1", 30000)) {
createCollection(null, "testcollection",
1, 1, 1, client, null, "conf1");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16a1a6f7/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
index 2e5aa7d..64c042d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java
@@ -125,7 +125,11 @@ public class ChaosMonkeyNothingIsSafeWithPullReplicasTest extends AbstractFullDi
@Override
protected CloudSolrClient createCloudClient(String defaultCollection) {
- CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), random().nextBoolean(), 30000, clientSoTimeout);
+ return this.createCloudClient(defaultCollection, this.clientSoTimeout);
+ }
+
+ protected CloudSolrClient createCloudClient(String defaultCollection, int socketTimeout) {
+ CloudSolrClient client = getCloudSolrClient(zkServer.getZkAddress(), random().nextBoolean(), 30000, socketTimeout);
client.setParallelUpdates(random().nextBoolean());
if (defaultCollection != null) client.setDefaultCollection(defaultCollection);
return client;
@@ -292,7 +296,7 @@ public class ChaosMonkeyNothingIsSafeWithPullReplicasTest extends AbstractFullDi
restartZk(1000 * (5 + random().nextInt(4)));
}
- try (CloudSolrClient client = createCloudClient("collection1")) {
+ try (CloudSolrClient client = createCloudClient("collection1", 30000)) {
// We don't really know how many live nodes we have at this point, so "maxShardsPerNode" needs to be > 1
createCollection(null, "testcollection",
1, 1, 10, client, null, "conf1");