Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spelling fixes 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1402367 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-10-26 01:25:21 +00:00
parent ac489d792f
commit 1a9d39470e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
View File

@ -243,7 +243,7 @@ class SolrZkServerProps extends QuorumPeerConfig {
// called by the modified version of parseProperties // called by the modified version of parseProperties
// when the myid file is missing. // when the myid file is missing.
public Long getMySeverId() { public Long getMyServerId() {
if (zkRun == null && solrPort == null) return null; if (zkRun == null && solrPort == null) return null;
Map<Long, QuorumPeer.QuorumServer> slist = getServers(); Map<Long, QuorumPeer.QuorumServer> slist = getServers();
@ -450,7 +450,7 @@ class SolrZkServerProps extends QuorumPeerConfig {
File myIdFile = new File(dataDir, "myid"); File myIdFile = new File(dataDir, "myid");
if (!myIdFile.exists()) { if (!myIdFile.exists()) {
///////////////// ADDED FOR SOLR ////// ///////////////// ADDED FOR SOLR //////
Long myid = getMySeverId(); Long myid = getMyServerId();
if (myid != null) { if (myid != null) {
serverId = myid; serverId = myid;
return; return;

2
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -603,7 +603,7 @@ public final class ZkController {
recoveryFuture.get(); // NOTE: this could potentially block for recoveryFuture.get(); // NOTE: this could potentially block for
// minutes or more! // minutes or more!
// TODO: public as recovering in the mean time? // 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 { } else {
log.info("No LogReplay needed for core="+core.getName() + " baseURL=" + baseUrl); log.info("No LogReplay needed for core="+core.getName() + " baseURL=" + baseUrl);
} }