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/02 22:46:45 UTC
svn commit: r1226555 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/cloud/
core/src/java/org/apache/solr/update/processor/
test-framework/src/java/org/apache/solr/
Author: markrmiller
Date: Mon Jan 2 21:46:44 2012
New Revision: 1226555
URL: http://svn.apache.org/viewvc?rev=1226555&view=rev
Log:
remove nocommits
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java?rev=1226555&r1=1226554&r2=1226555&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/RecoveryStrat.java Mon Jan 2 21:46:44 2012
@@ -22,7 +22,6 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.request.CoreAdminRequest.PrepRecovery;
@@ -37,10 +36,8 @@ import org.apache.solr.core.RequestHandl
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.request.SolrRequestHandler;
-import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.update.UpdateLog;
import org.apache.solr.update.UpdateLog.RecoveryInfo;
-import org.apache.solr.util.RefCounted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,52 +108,21 @@ public class RecoveryStrat {
while (!succesfulRecovery && !close) {
recoveryAttempts.incrementAndGet();
try {
-
ZkNodeProps leaderprops = zkStateReader.getLeaderProps(
cloudDesc.getCollectionName(), cloudDesc.getShardId());
-
replicate(core, shardZkNodeName, leaderprops, ZkCoreNodeProps.getCoreUrl(baseUrl, core.getName()));
- // nocommit: remove this
- int afterReplicateDocs = 0;
- RefCounted<SolrIndexSearcher> searcher = core.getSearcher(true,
- true, null);
- try {
- SolrIndexSearcher is = searcher.get();
- if (!core.isClosed()) {
- afterReplicateDocs = is.search(new MatchAllDocsQuery(), 1).totalHits;
- }
- } finally {
- searcher.decref();
- }
-
- System.out.println("apply buffered updates");
replay(core);
replayed = true;
- System.out.println("replay done");
-
- // nocommit: remove this
- int afterReplayDocs = 0;
- try {
- searcher = core.getSearcher(true, true, null);
- afterReplayDocs = searcher.get().search(
- new MatchAllDocsQuery(), 1).totalHits;
- } finally {
- searcher.decref();
- }
zkController
.publishAsActive(baseUrl, cloudDesc, shardZkNodeName, core.getName());
- System.out.println("url: " + baseUrl + " docs after replicate: "
- + afterReplicateDocs + " docs after replay:"
- + afterReplayDocs + " leader:" + leaderprops);
- // TODO: what if the problem was in onFinish.run which sets the
- // state?
+ if (recoveryListener != null) recoveryListener.finishedRecovery();
+
succesfulRecovery = true;
recoverySuccesses.incrementAndGet();
- if (recoveryListener != null) recoveryListener.finishedRecovery();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
log.error("Recovery was interrupted", e);
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=1226555&r1=1226554&r2=1226555&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 Mon Jan 2 21:46:44 2012
@@ -267,8 +267,6 @@ public class DistributedUpdateProcessor
if (!forwardToLeader) {
for (SolrCmdDistributor.Error error : response.errors) {
- // nocommit:
- System.out.println("try and tell " + error.node.getUrl() + " to recover");
// TODO: we should force their state to recovering ??
// TODO: do retries??
@@ -277,13 +275,11 @@ public class DistributedUpdateProcessor
try {
server = new CommonsHttpSolrServer(error.node.getBaseUrl());
- System.out.println("send recover cmd");
RequestRecovery recoverRequestCmd = new RequestRecovery();
recoverRequestCmd.setAction(CoreAdminAction.REQUESTRECOVERY);
recoverRequestCmd.setCoreName(error.node.getCoreName());
server.request(recoverRequestCmd);
- System.out.println("send recover request worked");
} catch (MalformedURLException e) {
log.error("", e);
} catch (SolrServerException e) {
Modified: lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1226555&r1=1226554&r2=1226555&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Mon Jan 2 21:46:44 2012
@@ -586,7 +586,7 @@ public abstract class BaseDistributedSea
protected void compareResponses(QueryResponse a, QueryResponse b) {
String cmp;
if (System.getProperty("remove.version.field") != null) {
- // nocommit: we don't care if one has a version and the other doesnt -
+ // we don't care if one has a version and the other doesnt -
// control vs distrib
for (SolrDocument doc : a.getResults()) {
doc.removeFields("_version_");