lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject lucene-solr:feature/autoscaling: SOLR-10397: Make AutoAddReplicasIntegrationTest more robust
Date Wed, 09 Aug 2017 07:32:00 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/feature/autoscaling 3761c4467 -> 0aee51084


SOLR-10397: Make AutoAddReplicasIntegrationTest more robust


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0aee5108
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0aee5108
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0aee5108

Branch: refs/heads/feature/autoscaling
Commit: 0aee51084909fa485e2858341023cadf6ab0a00f
Parents: 3761c44
Author: Cao Manh Dat <datcm@apache.org>
Authored: Wed Aug 9 14:31:52 2017 +0700
Committer: Cao Manh Dat <datcm@apache.org>
Committed: Wed Aug 9 14:31:52 2017 +0700

----------------------------------------------------------------------
 .../solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0aee5108/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
index 9d4647c..482630f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
@@ -87,7 +87,7 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
     waitForState("Waiting for collection " + COLLECTION1, COLLECTION1, clusterShape(2, 2));
     checkSharedFsReplicasMovedCorrectly(replacedHdfsReplicas, zkStateReader, COLLECTION1);
     lostJetty.start();
-    assertTrue("Timeout waiting for all live and active", ClusterStateUtil.waitForAllActiveAndLiveReplicas(cluster.getSolrClient().getZkStateReader(),
30000));
+    assertTrue("Timeout waiting for all live and active", ClusterStateUtil.waitForAllActiveAndLiveReplicas(cluster.getSolrClient().getZkStateReader(),
90000));
 
     // check cluster property is considered
     disableAutoAddReplicasInCluster();
@@ -96,7 +96,7 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
     waitForNodeLeave(lostNodeName);
     waitForState("Waiting for collection " + COLLECTION1, COLLECTION1, clusterShape(2, 1));
     jetty3.start();
-    assertTrue("Timeout waiting for all live and active", ClusterStateUtil.waitForAllActiveAndLiveReplicas(cluster.getSolrClient().getZkStateReader(),
30000));
+    assertTrue("Timeout waiting for all live and active", ClusterStateUtil.waitForAllActiveAndLiveReplicas(cluster.getSolrClient().getZkStateReader(),
90000));
     enableAutoAddReplicasInCluster();
 
 
@@ -171,7 +171,7 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase
{
 
   private void waitForNodeLeave(String lostNodeName) throws InterruptedException {
     ZkStateReader reader = cluster.getSolrClient().getZkStateReader();
-    TimeOut timeOut = new TimeOut(10, TimeUnit.SECONDS);
+    TimeOut timeOut = new TimeOut(20, TimeUnit.SECONDS);
     while (reader.getClusterState().getLiveNodes().contains(lostNodeName)) {
       Thread.sleep(100);
       if (timeOut.hasTimedOut()) fail("Wait for " + lostNodeName + " to leave failed!");


Mime
View raw message