You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/03/13 12:46:01 UTC

lucene-solr:branch_7x: SOLR-12067: Fix AutoAddReplicasIntegrationTest by using solr.xml which has autoReplicaFailoverWaitAfterExpiration set to 10 seconds

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 4645553a5 -> 19f6a309b


SOLR-12067: Fix AutoAddReplicasIntegrationTest by using solr.xml which has autoReplicaFailoverWaitAfterExpiration set to 10 seconds

(cherry picked from commit 536e16d)


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

Branch: refs/heads/branch_7x
Commit: 19f6a309b457b0fa981102f400ab494b39fad60d
Parents: 4645553
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Mar 13 18:15:21 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Mar 13 18:15:52 2018 +0530

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19f6a309/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 b1de714..08ff47d 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
@@ -44,7 +44,7 @@ import org.junit.Test;
 
 import static org.apache.solr.common.util.Utils.makeMap;
 
-@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG")
+@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG;org.apache.solr.client.solrj.cloud.autoscaling=DEBUG")
 public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
   private static final String COLLECTION1 =  "testSimple1";
   private static final String COLLECTION2 =  "testSimple2";
@@ -53,6 +53,7 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
   public static void setupCluster() throws Exception {
     configureCluster(3)
         .addConfig("conf", configset("cloud-minimal"))
+        .withSolrXml(TEST_PATH().resolve("solr.xml"))
         .configure();
   }