use count translog ops

elastic · Apr 30, 2019 · 07c3a7c · 07c3a7c
1 parent baceaad
commit 07c3a7c
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
@@ -312,17 +312,9 @@ public void finalizeRecovery(final long globalCheckpoint, ActionListener<Void> l
         });
     }
 
-    private boolean hasUncommittedOperations() {
-        if (indexShard.translogStats().getUncommittedOperations() == 0) {
-            return false;
-        }
-        // If a file-based occurs, the primary also sends its translog to the replica. If all of those
-        // translog operations are in the copying commit already, we should not flush (mainly to reserve syncId).
-        final SequenceNumbers.CommitInfo commitInfo = SequenceNumbers.loadSeqNoInfoFromLuceneCommit(
-            indexShard.commitStats().getUserData().entrySet());
-        return commitInfo.maxSeqNo != commitInfo.localCheckpoint
-            || commitInfo.maxSeqNo != indexShard.seqNoStats().getMaxSeqNo()
-            || commitInfo.maxSeqNo != indexShard.getLastSyncedGlobalCheckpoint();
+    private boolean hasUncommittedOperations() throws IOException {
+        long localCheckpointOfCommit = Long.parseLong(indexShard.commitStats().getUserData().get(SequenceNumbers.LOCAL_CHECKPOINT_KEY));
+        return indexShard.estimateNumberOfHistoryOperations("peer-recovery", localCheckpointOfCommit + 1) > 0;
     }
 
     @Override