svn commit: r1222811 - in /lucene/dev/branches/solrcloud/solr/core/src: java/org/apache/solr/handler/admin/CoreAdminHandler.java test/org/apache/solr/cloud/ChaosMonkey.java test/org/apache/solr/cloud/FullSolrCloudTest.java

[ma...@apache.org]

Author: markrmiller
Date: Fri Dec 23 19:38:54 2011
New Revision: 1222811

URL: http://svn.apache.org/viewvc?rev=1222811&view=rev
Log:
dont kill the leader yet

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1222811&r1=1222810&r2=1222811&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Fri Dec 23 19:38:54 2011
@@ -648,7 +648,7 @@ public class CoreAdminHandler extends Re
         
         RefCounted<SolrIndexSearcher> searcherRef = core.getSearcher();
         System.out.println("approx docs to replicate:"
-            + searcherRef.get().getIndexReader().numDocs());
+            + searcherRef.get().getIndexReader().numDocs() + " to " + nodeName);
         searcherRef.decref();
       } else {
         throw new SolrException(ErrorCode.BAD_REQUEST, "Could not find core:  "

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java?rev=1222811&r1=1222810&r2=1222811&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java Fri Dec 23 19:38:54 2011
@@ -42,6 +42,7 @@ import org.mortbay.jetty.servlet.FilterH
  */
 public class ChaosMonkey {
 
+  private static final boolean DONTKILLLEADER = true;
   private Map<String,List<CloudJettyRunner>> shardToJetty;
   private ZkTestServer zkServer;
   private ZkStateReader zkStateReader;
@@ -199,9 +200,11 @@ public class ChaosMonkey {
       if (props == null) {
         throw new RuntimeException("shard name " + cloudJetty.shardName + " not found in " + theShards.getShards().keySet());
       }
+      
       String state = props.get(ZkStateReader.STATE_PROP);
       String nodeName = props.get(ZkStateReader.NODE_NAME_PROP);
       
+      
       if (!cloudJetty.jetty.isRunning()
           || !state.equals(ZkStateReader.ACTIVE)
           || !zkStateReader.getCloudState().liveNodesContain(nodeName)) {
@@ -236,6 +239,15 @@ public class ChaosMonkey {
     JettySolrRunner jetty = jetties.get(index).jetty;
     System.out.println("sac shard "+ jetty.getLocalPort());
     
+    
+    ZkNodeProps leader = zkStateReader.getLeaderProps(collection, slice);
+    
+    if (DONTKILLLEADER && leader.get(ZkStateReader.NODE_NAME_PROP).equals(jetties.get(index).nodeName)) {
+      // we don't kill leaders...
+      System.out.println("dont kill the leader");
+      return null;
+    }
+    
     return jetty;
   }
   

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=1222811&r1=1222810&r2=1222811&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 Fri Dec 23 19:38:54 2011
@@ -250,9 +250,6 @@ public class FullSolrCloudTest extends A
     }
     shards = sb.toString();
     
-    // TODO: do we sometimes fail without this?
-    //waitForRecoveriesToFinish();
-    
     return jettys;
   }