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

LUCENE-5852: log errors that occur during cleanupOldIndexFiles 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1614264 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shai Erera 2014-07-29 06:57:46 +00:00
parent 6aeceaeb86
commit c1e3b3b9a7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyReplicationHandler.java
View File

@ -166,8 +166,8 @@ public class IndexAndTaxonomyReplicationHandler implements ReplicationHandler {
// side-effects, e.g. if it hits sudden IO errors while opening the index
// (and can end up deleting the entire index). It is not our job to protect
// against those errors, app will probably hit them elsewhere.
IndexReplicationHandler.cleanupOldIndexFiles(indexDir, indexSegmentsFile);
IndexReplicationHandler.cleanupOldIndexFiles(taxoDir, taxoSegmentsFile);
IndexReplicationHandler.cleanupOldIndexFiles(indexDir, indexSegmentsFile, infoStream);
IndexReplicationHandler.cleanupOldIndexFiles(taxoDir, taxoSegmentsFile, infoStream);
// successfully updated the index, notify the callback that the index is
// ready.

9
lucene/replicator/src/java/org/apache/lucene/replicator/IndexReplicationHandler.java
View File

@ -141,7 +141,7 @@ public class IndexReplicationHandler implements ReplicationHandler {
* directory. It suppresses any exceptions that occur, as this can be retried
* the next time.
*/
public static void cleanupOldIndexFiles(Directory dir, String segmentsFile) {
public static void cleanupOldIndexFiles(Directory dir, String segmentsFile, InfoStream infoStream) {
try {
IndexCommit commit = getLastCommit(dir);
// commit == null means weird IO errors occurred, ignore them
@ -164,9 +164,12 @@ public class IndexReplicationHandler implements ReplicationHandler {
}
}
} catch (Throwable t) {
// ignore any errors that happens during this state and only log it. this
// ignore any errors that happen during this state and only log it. this
// cleanup will have a chance to succeed the next time we get a new
// revision.
if (infoStream.isEnabled(INFO_STREAM_COMPONENT)) {
infoStream.message(INFO_STREAM_COMPONENT, "cleanupOldIndexFiles(): failed on error " + t.getMessage());
}
}
}
@ -280,7 +283,7 @@ public class IndexReplicationHandler implements ReplicationHandler {
// side-effects, e.g. if it hits sudden IO errors while opening the index
// (and can end up deleting the entire index). It is not our job to protect
// against those errors, app will probably hit them elsewhere.
cleanupOldIndexFiles(indexDir, segmentsFile);
cleanupOldIndexFiles(indexDir, segmentsFile, infoStream);
// successfully updated the index, notify the callback that the index is
// ready.