svn commit: r908820 - in /lucene/solr/branches/cloud/src: java/org/apache/solr/cloud/ test/org/apache/solr/cloud/ webapp/src/org/apache/solr/client/solrj/embedded/ webapp/src/org/apache/solr/servlet/

[ma...@apache.org]

Author: markrmiller
Date: Thu Feb 11 03:20:04 2010
New Revision: 908820

URL: http://svn.apache.org/viewvc?rev=908820&view=rev
Log:
remove nocommits

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
    lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
    lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
    lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=908820&r1=908819&r2=908820&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java Thu Feb 11 03:20:04 2010
@@ -730,10 +730,10 @@
             // most likely, the collections node has been created, but not the
             // shards node yet -- pause and try again
             madeWatch = false;
-            if(i == 4) {
-              // nocommit:
-              // no shards yet, just bail
-              break;
+            if (i == 4) {
+              throw new ZooKeeperException(
+                  SolrException.ErrorCode.SERVER_ERROR,
+                  "Could not set shards zknode watch, because the zknode does not exist");
             }
             Thread.sleep(50);
           }

Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkSolrClientTest.java?rev=908820&r1=908819&r2=908820&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkSolrClientTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkSolrClientTest.java Thu Feb 11 03:20:04 2010
@@ -64,7 +64,7 @@
     server.shutdown();
   }
   
-  // nocommit : must be a clear way to do this
+  // TODO : must be a better way to do this
   public void testReconnect() throws Exception {
     String zkDir = tmpDir.getAbsolutePath() + File.separator
         + "zookeeper/server1/data";
@@ -91,7 +91,7 @@
       try {
         zkClient.makePath("collections/collection2");
       } catch (KeeperException.ConnectionLossException e) {
-        // nocommit : the connection should be down
+        // the connection should be down
         exceptionHappened = true;
       }
       
@@ -173,10 +173,6 @@
       zkClient.printLayoutToStdOut();
 
 
-    } catch (Exception e) {
-      // nocommit
-      e.printStackTrace();
-      throw e;
     } finally {
 
       if (zkClient != null) {

Modified: lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=908820&r1=908819&r2=908820&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Thu Feb 11 03:20:04 2010
@@ -53,8 +53,6 @@
   public JettySolrRunner( String context, int port, String solrConfigFilename )
   {
     this.init( context, port );
-    // nocommit
-    System.out.println("set config:" + solrConfigFilename);
     dispatchFilter.setInitParameter("solrconfig-filename", solrConfigFilename);
   }
   
@@ -104,13 +102,10 @@
   }
   
   public void setPortOverride(int port) {
-    //nocommit:
     dispatchFilter.setInitParameter("zkPortOverride", Integer.toString(port));
   }
   
   public void setTestShardListOverride(String shardList) {
-    //nocommit:
-    System.out.println("set shardlist override:"+shardList);
     dispatchFilter.setInitParameter("testShardListOverride", shardList);
   }
 

Modified: lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=908820&r1=908819&r2=908820&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/solr/branches/cloud/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java Thu Feb 11 03:20:04 2010
@@ -82,7 +82,6 @@
       // web.xml configuration
       this.pathPrefix = config.getInitParameter( "path-prefix" );
       init.setSolrConfigFilename(config.getInitParameter("solrconfig-filename"));
-      // nocommit : consider
       init.setZKPortOverride(config.getInitParameter("zkPortOverride"));
       init.setTestShardListOverride(config.getInitParameter("testShardListOverride"));