Funny business

jasontedor · Mar 23, 2017 · 192a7ce · 192a7ce
1 parent 3c78802
commit 192a7ce
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/core/src/main/java/org/elasticsearch/index/translog/Translog.java
@@ -358,7 +358,7 @@ private int totalOperations(long minGeneration) {
         try (ReleasableLock ignored = readLock.acquire()) {
             ensureOpen();
             return Stream.concat(readers.stream(), Stream.of(current))
-                    .filter(r -> r.getGeneration() >= minGeneration)
+                    .filter(r -> r.getGeneration() > minGeneration)
                     .mapToInt(BaseTranslogReader::totalOperations)
                     .sum();
         }
@@ -371,7 +371,7 @@ private long sizeInBytes(long minGeneration) {
         try (ReleasableLock ignored = readLock.acquire()) {
             ensureOpen();
             return Stream.concat(readers.stream(), Stream.of(current))
-                    .filter(r -> r.getGeneration() >= minGeneration)
+                    .filter(r -> r.getGeneration() > minGeneration)
                     .mapToLong(BaseTranslogReader::sizeInBytes)
                     .sum();
         }
@@ -519,7 +519,7 @@ private Snapshot createSnapshot(long minGeneration) {
     public Translog.View newView() {
         try (ReleasableLock lock = readLock.acquire()) {
             ensureOpen();
-            View view = new View(lastCommittedTranslogFileGeneration);
+            View view = new View(lastCommittedTranslogFileGeneration + 1);
             outstandingViews.add(view);
             return view;
         }
@@ -1418,9 +1418,9 @@ void trimUnreferencedReaders() {
                 return;
             }
             long minReferencedGen = outstandingViews.stream().mapToLong(View::minTranslogGeneration).min().orElse(Long.MAX_VALUE);
-            minReferencedGen = Math.min(lastCommittedTranslogFileGeneration, minReferencedGen);
+            minReferencedGen = Math.min(lastCommittedTranslogFileGeneration + 1, minReferencedGen);
             final long finalMinReferencedGen = minReferencedGen;
-            List<TranslogReader> unreferenced = readers.stream().filter(r -> r.getGeneration() <= finalMinReferencedGen).collect(Collectors.toList());
+            List<TranslogReader> unreferenced = readers.stream().filter(r -> r.getGeneration() < finalMinReferencedGen).collect(Collectors.toList());
             for (final TranslogReader unreferencedReader : unreferenced) {
                 Path translogPath = unreferencedReader.path();
                 logger.trace("delete translog file - not referenced and not current anymore {}", translogPath);