svn commit: r1208234 - in /lucene/dev/branches/solrcloud/solr/core/src: java/org/apache/solr/cloud/ZkController.java java/org/apache/solr/update/processor/DistributedUpdateProcessor.java test/org/apache/solr/cloud/FullDistributedZkTest.java

[ma...@apache.org]

Author: markrmiller
Date: Wed Nov 30 03:25:26 2011
New Revision: 1208234

URL: http://svn.apache.org/viewvc?rev=1208234&view=rev
Log:
minor tweaks to cloud tests and logging

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1208234&r1=1208233&r2=1208234&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Nov 30 03:25:26 2011
@@ -538,6 +538,7 @@ public final class ZkController {
     }
     
     if (doRecovery) {
+      log.info("Start recovery process");
       core.getUpdateHandler().getUpdateLog().bufferUpdates();
       final String frozenShardId = shardId;
       Thread thread = new Thread() {
@@ -621,7 +622,7 @@ public final class ZkController {
   private void doRecovery(String collection, final CoreDescriptor desc,
       final CloudDescriptor cloudDesc, boolean iamleader) throws Exception,
       SolrServerException, IOException {
-    log.info("Start recovery process");
+
     // start buffer updates to tran log
     // and do recovery - either replay via realtime get 
     // or full index replication

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1208234&r1=1208233&r2=1208234&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Wed Nov 30 03:25:26 2011
@@ -510,7 +510,15 @@ public class DistributedUpdateProcessor 
     CloudState cloudState = req.getCore().getCoreDescriptor()
         .getCoreContainer().getZkController().getCloudState();
    
-    Slice replicas = cloudState.getSlices(collection).get(shardId);
+    Map<String,Slice> slices = cloudState.getSlices(collection);
+    if (slices == null) {
+      throw new ZooKeeperException(ErrorCode.BAD_REQUEST, "Could not find collection in zk: " + collection);
+    }
+    
+    Slice replicas = slices.get(shardId);
+    if (replicas == null) {
+      throw new ZooKeeperException(ErrorCode.BAD_REQUEST, "Could not find shardId in zk: " + shardId);
+    }
     
     Map<String,ZkNodeProps> shardMap = replicas.getShards();
     List<String> urls = new ArrayList<String>();

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java?rev=1208234&r1=1208233&r2=1208234&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java Wed Nov 30 03:25:26 2011
@@ -231,6 +231,7 @@ public class FullDistributedZkTest exten
     }
     // we have to wait for the cloud state to be updated
     // TODO: instead we should poll or something
+    Thread.sleep(2000);
     initCloud();
     updateMappingsFromZk(jettys, clients);
     
@@ -250,7 +251,7 @@ public class FullDistributedZkTest exten
   protected void updateMappingsFromZk(List<JettySolrRunner> jettys,
       List<SolrServer> clients) throws Exception,
       IOException, KeeperException, URISyntaxException {
-    zkStateReader.createClusterStateWatchersAndUpdate();
+    zkStateReader.updateCloudState(true);
     for (SolrServer client : clients) {
       // find info for this client in zk