svn commit: r1423179 - /lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

[yo...@apache.org]

Author: yonik
Date: Mon Dec 17 21:59:25 2012
New Revision: 1423179

URL: http://svn.apache.org/viewvc?rev=1423179&view=rev
Log:
tests: show details of count mismatch

Modified:
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1423179&r1=1423178&r2=1423179&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Mon Dec 17 21:59:25 2012
@@ -52,6 +52,7 @@ import org.apache.solr.common.cloud.ZkCo
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -855,8 +856,14 @@ public abstract class AbstractFullDistri
   
   protected void checkShardConsistency(boolean checkVsControl, boolean verbose)
       throws Exception {
-    long docs = controlClient.query(new SolrQuery("*:*")).getResults()
-        .getNumFound();
+    SolrParams q = params("q","*:*","fl","id,_version_","rows","100000");
+
+    SolrDocumentList controlDocList = controlClient.query(q).getResults();
+    long docs = controlDocList.getNumFound();
+
+    SolrDocumentList cloudDocList = cloudClient.query(q).getResults();
+    long cloudClientDocs = cloudDocList.getNumFound();
+
     if (verbose) System.err.println("Control Docs:" + docs);
     
     updateMappingsFromZk(jettys, clients);
@@ -907,11 +914,13 @@ public abstract class AbstractFullDistri
         }
       }
       
-      SolrQuery q = new SolrQuery("*:*");
-      long cloudClientDocs = cloudClient.query(q).getResults().getNumFound();
-      assertEquals(
-          "adding up the # of docs on each shard does not match the control - cloud client returns:"
-              + cloudClientDocs, docs, cnt);
+
+      if (docs != cnt || cloudClientDocs != docs) {
+        String msg = "document count mismatch.  control=" + docs + " sum(shards)="+ cnt + " cloudClient="+cloudClientDocs;
+        log.error(msg);
+        showDiff(controlDocList, cloudDocList,"controlDocList","cloudDocList");
+        fail(msg);
+      }
     }
   }