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 2014/12/02 17:48:38 UTC
svn commit: r1642951 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
Author: yonik
Date: Tue Dec 2 16:48:37 2014
New Revision: 1642951
URL: http://svn.apache.org/r1642951
Log:
SOLR-6776: only clear changesSinceCommit on a hard commit so tlog will still be flushed on a softCommit
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1642951&r1=1642950&r2=1642951&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Tue Dec 2 16:48:37 2014
@@ -75,6 +75,10 @@ Bug Fixes
* SOLR-6796: distrib.singlePass does not return correct set of fields for multi-fl-parameter
requests. (Per Steffensen via shalin)
+* SOLR-6776: Transaction log was not flushed at the end of update requests with softCommit
+ specified, which could lead to data loss if the server were killed immediately after the
+ update finished. (Jeffery Yuan via yonik)
+
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java?rev=1642951&r1=1642950&r2=1642951&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java Tue Dec 2 16:48:37 2014
@@ -94,7 +94,10 @@ class RunUpdateProcessor extends UpdateR
{
updateHandler.commit(cmd);
super.processCommit(cmd);
- changesSinceCommit = false;
+ if (!cmd.softCommit) {
+ // a hard commit means we don't need to flush the transaction log
+ changesSinceCommit = false;
+ }
}
/**