From d0a9c35c6928fe03695679cc417795ba36b7a3c4 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Fri, 20 Feb 2015 22:30:02 +0100 Subject: [PATCH] Prune all segment_N files not just newer ones --- .../elasticsearch/common/lucene/Lucene.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java index d7eb7b9dc2f..1a58b15b839 100644 --- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -152,23 +152,25 @@ public class Lucene { */ public static SegmentInfos pruneUnreferencedFiles(String segmentsFileName, Directory directory) throws IOException { final SegmentInfos si = readSegmentInfos(segmentsFileName, directory); - while (true) { + int foundSegmentFiles = 0; + for (final String file : directory.listAll()) { /** * we could also use a deletion policy here but in the case of snapshot and restore * sometimes we restore an index and override files that were referenced by a "future" * commit. If such a commit is opened by the IW it would likely throw a corrupted index exception * since checksums don's match anymore. that's why we prune the name here directly. * We also want the caller to know if we were not able to remove a segments_N file. - * */ - String lastSegmentsFile = SegmentInfos.getLastCommitSegmentsFileName(directory); - if (lastSegmentsFile == null) { - throw new IllegalStateException("no commit found in the directory"); + if (file.startsWith(IndexFileNames.SEGMENTS)) { + foundSegmentFiles++; + if (file.equals(si.getSegmentsFileName()) == false) { + directory.deleteFile(file); // remove all segment_N files except of the one we wanna keep + } } - if (lastSegmentsFile.equals(si.getSegmentsFileName())) { - break; - } - directory.deleteFile(lastSegmentsFile); + } + assert SegmentInfos.getLastCommitSegmentsFileName(directory).equals(segmentsFileName); + if (foundSegmentFiles == 0) { + throw new IllegalStateException("no commit found in the directory"); } final CommitPoint cp = new CommitPoint(si, directory); try (IndexWriter _ = new IndexWriter(directory, new IndexWriterConfig(Lucene.STANDARD_ANALYZER)