You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/01/26 17:17:24 UTC
svn commit: r1236271 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud:
AssignShard.java LeaderElector.java ZkController.java
Author: markrmiller
Date: Thu Jan 26 16:17:23 2012
New Revision: 1236271
URL: http://svn.apache.org/viewvc?rev=1236271&view=rev
Log:
clean up javadoc
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/AssignShard.java?rev=1236271&r1=1236270&r2=1236271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/AssignShard.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/AssignShard.java Thu Jan 26 16:17:23 2012
@@ -35,11 +35,8 @@ public class AssignShard {
* Assign a new unique id up to slices count - then add replicas evenly.
*
* @param collection
- *
- * @param slices
+ * @param state
* @return
- * @throws InterruptedException
- * @throws KeeperException
*/
public static String assignShard(String collection, CloudState state) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java?rev=1236271&r1=1236270&r2=1236271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java Thu Jan 26 16:17:23 2012
@@ -199,7 +199,6 @@ public class LeaderElector {
* watch the next lowest numbered node.
*
* @param context
- * @param SolrCore - optional - sometimes null
* @return sequential node number
* @throws KeeperException
* @throws InterruptedException
@@ -256,8 +255,7 @@ public class LeaderElector {
/**
* Set up any ZooKeeper nodes needed for leader election.
*
- * @param shardId
- * @param collection
+ * @param context
* @throws InterruptedException
* @throws KeeperException
*/
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1236271&r1=1236270&r2=1236271&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Thu Jan 26 16:17:23 2012
@@ -130,16 +130,15 @@ public final class ZkController {
zkServer.stop();
}
-
/**
- * @param coreContainer if null, recovery will not be enabled
+ * @param cc if null, recovery will not be enabled
* @param zkServerAddress
* @param zkClientTimeout
* @param zkClientConnectTimeout
* @param localHost
* @param locaHostPort
* @param localHostContext
- * @param numShards
+ * @param registerOnReconnect
* @throws InterruptedException
* @throws TimeoutException
* @throws IOException
@@ -437,13 +436,14 @@ public final class ZkController {
}
+
/**
* Register shard with ZooKeeper.
*
* @param coreName
- * @param cloudDesc
- * @return
- * @throws Exception
+ * @param desc
+ * @return the shardId for the SolrCore
+ * @throws Exception
*/
public String register(String coreName, final CoreDescriptor desc) throws Exception {
return register(coreName, desc, false);
@@ -456,7 +456,7 @@ public final class ZkController {
* @param coreName
* @param desc
* @param recoverReloadedCores
- * @return
+ * @return the shardId for the SolrCore
* @throws Exception
*/
public String register(String coreName, final CoreDescriptor desc, boolean recoverReloadedCores) throws Exception {