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 03:37:15 UTC
svn commit: r1226331 - in /lucene/dev/branches/solrcloud/solr/core/src:
java/org/apache/solr/cloud/ java/org/apache/solr/handler/
java/org/apache/solr/handler/admin/ test/org/apache/solr/cloud/
Author: markrmiller
Date: Mon Jan 2 02:37:14 2012
New Revision: 1226331
URL: http://svn.apache.org/viewvc?rev=1226331&view=rev
Log:
try some positive looking changes for jenkins stressing
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/handler/ReplicationHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.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=1226331&r1=1226330&r2=1226331&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 02:37:14 2012
@@ -101,7 +101,7 @@ public class RecoveryStrat {
// TODO: consider any races issues here
// was checking state first, but there is a race..
ulog.bufferUpdates();
-
+ boolean replayed = false;
boolean succesfulRecovery = false;
int retries = 0;
while (!succesfulRecovery && !close) {
@@ -115,25 +115,33 @@ public class RecoveryStrat {
replicate(core, shardZkNodeName, leaderprops, ZkCoreNodeProps.getCoreUrl(baseUrl, core.getName()));
// nocommit: remove this
+ int afterReplicateDocs = 0;
RefCounted<SolrIndexSearcher> searcher = core.getSearcher(true,
true, null);
- SolrIndexSearcher is = searcher.get();
- int afterReplicateDocs = 0;
- if (!core.isClosed()) {
- afterReplicateDocs = is.search(new MatchAllDocsQuery(), 1).totalHits;
+ 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
- searcher = core.getSearcher(true, true, null);
- int afterReplayDocs = searcher.get().search(
- new MatchAllDocsQuery(), 1).totalHits;
- searcher.decref();
-
+ int afterReplayDocs = 0;
+ try {
+ searcher = core.getSearcher(true, true, null);
+ afterReplayDocs = searcher.get().search(
+ new MatchAllDocsQuery(), 1).totalHits;
+ } finally {
+ searcher.decref();
+ }
+
if (recoveryListener != null) recoveryListener.finishedRecovery();
zkController
@@ -152,6 +160,17 @@ public class RecoveryStrat {
retries = MAX_RETRIES;
} catch (Throwable t) {
log.error("Error while trying to recover", t);
+ } finally {
+ if (!replayed) {
+ // TODO: try and bust out replay - better if we can drop buffer...
+ try {
+ replay(core);
+ } catch (Exception e) {
+ // nocommit
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
if (!succesfulRecovery) {
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1226331&r1=1226330&r2=1226331&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Mon Jan 2 02:37:14 2012
@@ -136,6 +136,7 @@ public class ReplicationHandler extends
// in a catastrophic failure, but will result in the client getting an empty file list for
// the CMD_GET_FILE_LIST command.
//
+ System.out.println("sending commit point:" + commitPoint.getVersion());
core.getDeletionPolicy().setReserveDuration(commitPoint.getVersion(), reserveCommitDuration);
rsp.add(CMD_INDEX_VERSION, commitPoint.getVersion());
rsp.add(GENERATION, commitPoint.getGeneration());
@@ -758,12 +759,12 @@ public class ReplicationHandler extends
}
- void refreshCommitpoint() {
- IndexCommit commitPoint = core.getDeletionPolicy().getLatestCommit();
- if(replicateOnCommit || (replicateOnOptimize && commitPoint.getSegmentCount() == 1)) {
- indexCommitPoint = commitPoint;
- }
- }
+// void refreshCommitpoint() {
+// IndexCommit commitPoint = core.getDeletionPolicy().getLatestCommit();
+// if(replicateOnCommit || (replicateOnOptimize && commitPoint.getSegmentCount() == 1)) {
+// indexCommitPoint = commitPoint;
+// }
+// }
@SuppressWarnings("unchecked")
public void inform(SolrCore core) {
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1226331&r1=1226330&r2=1226331&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Mon Jan 2 02:37:14 2012
@@ -483,8 +483,7 @@ public class SnapPuller {
solrCore.getUpdateHandler().newIndexWriter();
// update our commit point to the right dir
solrCore.getUpdateHandler().commit(new CommitUpdateCommand(req, false));
-
- replicationHandler.refreshCommitpoint();
+
} finally {
req.close();
}
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1226331&r1=1226330&r2=1226331&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Jan 2 02:37:14 2012
@@ -648,7 +648,9 @@ public class CoreAdminHandler extends Re
RefCounted<SolrIndexSearcher> searcherRef = core.getSearcher();
System.out.println("approx docs to replicate:"
- + searcherRef.get().getIndexReader().numDocs() + " to " + nodeName);
+ + searcherRef.get().getIndexReader().numDocs() + " to " + nodeName
+ + " commit point:"
+ + core.getDeletionPolicy().getLatestCommit().getVersion());
searcherRef.decref();
} else {
throw new SolrException(ErrorCode.BAD_REQUEST, "Could not find core: "
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1226331&r1=1226330&r2=1226331&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Mon Jan 2 02:37:14 2012
@@ -201,6 +201,7 @@ public class LeaderElectionIntegrationTe
}
// the original leader should be leader again now - everyone else is down
+ // TODO: I saw this fail once...expected:<7000> but was:<7004>
assertEquals(leaderPort, getLeaderPort(getLeader()));
//printLayout(zkServer.getZkAddress());
//Thread.sleep(100000);