You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2012/10/26 03:25:21 UTC
svn commit: r1402367 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud:
SolrZkServer.java ZkController.java
Author: yonik
Date: Fri Oct 26 01:25:21 2012
New Revision: 1402367
URL: http://svn.apache.org/viewvc?rev=1402367&view=rev
Log:
spelling fixes
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.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/SolrZkServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java?rev=1402367&r1=1402366&r2=1402367&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java Fri Oct 26 01:25:21 2012
@@ -243,7 +243,7 @@ class SolrZkServerProps extends QuorumPe
// called by the modified version of parseProperties
// when the myid file is missing.
- public Long getMySeverId() {
+ public Long getMyServerId() {
if (zkRun == null && solrPort == null) return null;
Map<Long, QuorumPeer.QuorumServer> slist = getServers();
@@ -450,7 +450,7 @@ class SolrZkServerProps extends QuorumPe
File myIdFile = new File(dataDir, "myid");
if (!myIdFile.exists()) {
///////////////// ADDED FOR SOLR //////
- Long myid = getMySeverId();
+ Long myid = getMyServerId();
if (myid != null) {
serverId = myid;
return;
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=1402367&r1=1402366&r2=1402367&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 Fri Oct 26 01:25:21 2012
@@ -603,7 +603,7 @@ public final class ZkController {
recoveryFuture.get(); // NOTE: this could potentially block for
// minutes or more!
// TODO: public as recovering in the mean time?
- // TODO: in the future we could do peerync in parallel with recoverFromLog
+ // TODO: in the future we could do peersync in parallel with recoverFromLog
} else {
log.info("No LogReplay needed for core="+core.getName() + " baseURL=" + baseUrl);
}