You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/01/22 14:14:17 UTC
svn commit: r1653846 - in /lucene/dev/branches/lucene_solr_5_0: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Author: shalin
Date: Thu Jan 22 13:14:17 2015
New Revision: 1653846
URL: http://svn.apache.org/r1653846
Log:
SOLR-6640: Exclude lock files from unused file check
Modified:
lucene/dev/branches/lucene_solr_5_0/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1653846&r1=1653845&r2=1653846&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Thu Jan 22 13:14:17 2015
@@ -584,7 +584,7 @@ public class SnapPuller {
}
String[] allFiles = indexDir.listAll();
for (String file : allFiles) {
- if (!file.equals(segmentsFileName) && !currentFiles.contains(file)) {
+ if (!file.equals(segmentsFileName) && !currentFiles.contains(file) && !file.endsWith(".lock")) {
LOG.info("Found unused file: " + file);
return true;
}