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

SOLR-2100: fix saveCommitPoint, remove unneeded calls to saveCommitPoint 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@993085 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-09-06 16:26:05 +00:00
parent d9226b03c3
commit 0a6fbd8336
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -453,6 +453,11 @@ Bug Fixes
* SOLR-1630: Fix spell checking collation issue related to token positions (rmuir, gsingers)
* SOLR-2100: The replication handler backup command didn't save the commit
point and hence could fail when a newer commit caused the older commit point
to be removed before it was finished being copied. This did not affect
normal master/slave replication. (Peter Sturge via yonik)
Other Changes
----------------------

3
solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
View File

@ -107,6 +107,7 @@ public class IndexDeletionPolicyWrapper implements IndexDeletionPolicy {
AtomicInteger reserveCount = savedCommits.get(indexCommitVersion);
if (reserveCount == null) reserveCount = new AtomicInteger();
reserveCount.incrementAndGet();
savedCommits.put(indexCommitVersion, reserveCount);
}
/** Release a previously saved commit point */
@ -167,7 +168,7 @@ public class IndexDeletionPolicyWrapper implements IndexDeletionPolicy {
Long version = delegate.getVersion();
Long reserve = reserves.get(version);
if (reserve != null && System.currentTimeMillis() < reserve) return;
if(savedCommits.contains(version)) return;
if(savedCommits.containsKey(version)) return;
delegate.delete();
}

26
solr/src/java/org/apache/solr/handler/ReplicationHandler.java
View File

@ -282,10 +282,9 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if(indexCommit == null) {
indexCommit = req.getSearcher().getReader().getIndexCommit();
// race?
delPolicy.setReserveDuration(indexCommit.getVersion(), reserveCommitDuration);
}
// small race here before the commit point is saved
new SnapShooter(core, params.get("location")).createSnapAsync(indexCommit, this);
} catch (Exception e) {
@ -793,14 +792,14 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
List backup = master.getAll("backupAfter");
boolean backupOnCommit = backup.contains("commit");
boolean backupOnOptimize = backup.contains("optimize");
boolean backupOnOptimize = !backupOnCommit && backup.contains("optimize");
List replicateAfter = master.getAll(REPLICATE_AFTER);
replicateOnCommit = replicateAfter.contains("commit");
replicateOnOptimize = replicateAfter.contains("optimize");
replicateOnOptimize = !replicateOnCommit && replicateAfter.contains("optimize");
// if we only want to replicate on optimize, we need the deletion policy to
// save the last optimized commit point.
if (replicateOnOptimize && !replicateOnCommit) {
if (replicateOnOptimize) {
IndexDeletionPolicyWrapper wrapper = core.getDeletionPolicy();
IndexDeletionPolicy policy = wrapper == null ? null : wrapper.getWrappedDeletionPolicy();
if (policy instanceof SolrDeletionPolicy) {
@ -827,7 +826,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
IndexReader reader = s==null ? null : s.get().getReader();
if (reader!=null && reader.getIndexCommit() != null && reader.getIndexCommit().getGeneration() != 1L) {
try {
if(!replicateOnCommit && replicateOnOptimize){
if(replicateOnOptimize){
Collection<IndexCommit> commits = IndexReader.listCommits(reader.directory());
for (IndexCommit ic : commits) {
if(ic.isOptimized()){
@ -928,20 +927,27 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
* This refreshes the latest replicateable index commit and optionally can create Snapshots as well
*/
public void postCommit() {
IndexCommit currentCommitPoint = core.getDeletionPolicy().getLatestCommit();
if (getCommit) {
IndexCommit oldCommitPoint = indexCommitPoint;
indexCommitPoint = core.getDeletionPolicy().getLatestCommit();
// IndexCommit oldCommitPoint = indexCommitPoint;
indexCommitPoint = currentCommitPoint;
// We don't need to save commit points for replication, the SolrDeletionPolicy
// always saves the last commit point (and the last optimized commit point, if needed)
/***
if (indexCommitPoint != null) {
core.getDeletionPolicy().saveCommitPoint(indexCommitPoint.getVersion());
}
if(oldCommitPoint != null){
core.getDeletionPolicy().releaseCommitPoint(oldCommitPoint.getVersion());
}
***/
}
if (snapshoot) {
try {
SnapShooter snapShooter = new SnapShooter(core, null);
snapShooter.createSnapAsync(core.getDeletionPolicy().getLatestCommit(), ReplicationHandler.this);
snapShooter.createSnapAsync(currentCommitPoint, ReplicationHandler.this);
} catch (Exception e) {
LOG.error("Exception while snapshooting", e);
}