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 2012/02/18 02:31:12 UTC

svn commit: r1245835 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java

Author: markrmiller
Date: Sat Feb 18 01:31:11 2012
New Revision: 1245835

URL: http://svn.apache.org/viewvc?rev=1245835&view=rev
Log:
fail if we don't see recovering shard flip to active and correct doc count checks (distrib=false)

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1245835&r1=1245834&r2=1245835&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Sat Feb 18 01:31:11 2012
@@ -81,7 +81,7 @@ public class RecoveryZkTest extends Full
     // make sure replication can start
     Thread.sleep(1500);
     
-    waitForRecoveriesToFinish(false);
+    waitForRecoveriesToFinish(DEFAULT_COLLECTION, zkStateReader, false, true);
     
     // stop indexing threads
     indexThread.safeStop();
@@ -97,9 +97,10 @@ public class RecoveryZkTest extends Full
     // test that leader and replica have same doc count
     
     checkShardConsistency("shard1", false); 
-    
-    long client1Docs = shardToClient.get("shard1").get(0).query(new SolrQuery("*:*")).getResults().getNumFound();
-    long client2Docs = shardToClient.get("shard1").get(1).query(new SolrQuery("*:*")).getResults().getNumFound();
+    SolrQuery query = new SolrQuery("*:*");
+    query.setParam("distrib", "false");
+    long client1Docs = shardToClient.get("shard1").get(0).query(query).getResults().getNumFound();
+    long client2Docs = shardToClient.get("shard1").get(1).query(query).getResults().getNumFound();
     
     assertTrue(client1Docs > 0);
     assertEquals(client1Docs, client2Docs);