svn commit: r1220342 - in /lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud: ChaosMonkeySolrCloudTest.java FullSolrCloudTest.java

[ma...@apache.org]

Author: markrmiller
Date: Sun Dec 18 07:23:26 2011
New Revision: 1220342

URL: http://svn.apache.org/viewvc?rev=1220342&view=rev
Log:
minor test tweaks

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java?rev=1220342&r1=1220341&r2=1220342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java Sun Dec 18 07:23:26 2011
@@ -17,15 +17,16 @@ package org.apache.solr.cloud;
  * limitations under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.solr.client.solrj.SolrQuery;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 
 /**
  * TODO: sometimes the shards are off by a doc or two, even with the
  * retries on index failure...perhaps because of leader dying mid update?
  */
-@Ignore("still fails too often")
 public class ChaosMonkeySolrCloudTest extends FullSolrCloudTest {
   
   @BeforeClass
@@ -48,12 +49,13 @@ public class ChaosMonkeySolrCloudTest ex
     
     del("*:*");
     
-    StopableIndexingThread indexThread = new StopableIndexingThread(0);
-    indexThread.start();
-    StopableIndexingThread indexThread2 = new StopableIndexingThread(0);
-    indexThread2.start();
-    StopableIndexingThread indexThread3 = new StopableIndexingThread(0);
-    indexThread3.start();
+    List<StopableIndexingThread> threads = new ArrayList<StopableIndexingThread>();
+    for (int i = 0; i < 3; i++) {
+      StopableIndexingThread indexThread = new StopableIndexingThread(0);
+      threads.add(indexThread);
+      indexThread.start();
+    }
+    
     
     chaosMonkey.startTheMonkey();
     
@@ -61,9 +63,10 @@ public class ChaosMonkeySolrCloudTest ex
     
     chaosMonkey.stopTheMonkey();
     
-    indexThread.safeStop();
-    indexThread2.safeStop();
-    indexThread3.safeStop();
+    for (StopableIndexingThread indexThread : threads) {
+      indexThread.safeStop();
+    }
+    
     
     // try and wait for any replications and what not to finish...
     // TODO: I suppose we should poll zk here about state

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1220342&r1=1220341&r2=1220342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Sun Dec 18 07:23:26 2011
@@ -826,7 +826,12 @@ public class FullSolrCloudTest extends A
         }
       }
     }
-    assertEquals(docs, cnt);
+    SolrQuery q = new SolrQuery("*:*");
+    q.set("distrib", true);
+    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);
   }
 
   private SolrServer getClient(String nodeName) {
@@ -948,12 +953,10 @@ public class FullSolrCloudTest extends A
             controlClient.deleteById(Integer.toString(delete));
             cloudClient.deleteById(Integer.toString(delete));
             numDeletes++;
-          } catch (SolrServerException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-          } catch (IOException e) {
-            // TODO Auto-generated catch block
+          } catch (Exception e) {
+            System.err.println("REQUEST FAILED:");
             e.printStackTrace();
+            fails++;
           }
 
         }