Don’t check local_checkpoint in commit

Author: dnhatn

server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java

@@ -105,9 +105,7 @@ private void updateRetentionPolicy() throws IOException {
         translogDeletionPolicy.setTranslogGenerationOfLastCommit(lastGen);
         translogDeletionPolicy.setMinTranslogGenerationForRecovery(minRequiredGen);
 
-        if (safeCommit.getUserData().containsKey(SequenceNumbers.LOCAL_CHECKPOINT_KEY)) {
-            softDeletesPolicy.setCheckpointOfSafeCommit(Long.parseLong(safeCommit.getUserData().get(SequenceNumbers.LOCAL_CHECKPOINT_KEY)));
-        }
+        softDeletesPolicy.setCheckpointOfSafeCommit(Long.parseLong(safeCommit.getUserData().get(SequenceNumbers.LOCAL_CHECKPOINT_KEY)));
     }
 
     /**

server/src/main/java/org/elasticsearch/index/engine/SoftDeletesPolicy.java

@@ -34,7 +34,7 @@
  */
 final class SoftDeletesPolicy {
     private final LongSupplier globalCheckpointSupplier;
-    private int retentionNumLocks = 0;
+    private int retentionLockCount;
     private long checkpointOfSafeCommit;
     private volatile long minRequiredSeqNoForRecovery;
     private volatile long retentionOperations;
@@ -44,6 +44,7 @@ final class SoftDeletesPolicy {
         this.retentionOperations = retentionOperations;
         this.checkpointOfSafeCommit = SequenceNumbers.NO_OPS_PERFORMED;
         this.minRequiredSeqNoForRecovery = checkpointOfSafeCommit + 1;
+        this.retentionLockCount = 0;
     }
 
     /**
@@ -69,7 +70,7 @@ synchronized void setCheckpointOfSafeCommit(long newCheckpoint) {
 
     private void updateMinRequiredSeqNoForRecovery() {
         assert Thread.holdsLock(this) : Thread.currentThread().getName();
-        if (retentionNumLocks == 0) {
+        if (retentionLockCount == 0) {
             // Need to keep all operations after the local checkpoint of the safe commit for recovery purpose.
             this.minRequiredSeqNoForRecovery = checkpointOfSafeCommit + 1;
         }
@@ -81,8 +82,8 @@ private void updateMinRequiredSeqNoForRecovery() {
      * This is a analogy to the translog's retention lock; see {@link Translog#acquireRetentionLock()}
      */
     synchronized Releasable acquireRetentionLock() {
-        retentionNumLocks++;
-        assert retentionNumLocks > 0 : "Invalid number of retention locks [" + retentionNumLocks + "]";
+        retentionLockCount++;
+        assert retentionLockCount > 0 : "Invalid number of retention locks [" + retentionLockCount + "]";
         final AtomicBoolean released = new AtomicBoolean();
         return () -> {
             if (released.compareAndSet(false, true)) {
@@ -92,8 +93,8 @@ synchronized Releasable acquireRetentionLock() {
     }
 
     private synchronized void releaseRetentionLock() {
-        retentionNumLocks--;
-        assert retentionNumLocks >= 0 : "Invalid number of retention locks [" + retentionNumLocks + "]";
+        retentionLockCount--;
+        assert retentionLockCount >= 0 : "Invalid number of retention locks [" + retentionLockCount + "]";
         updateMinRequiredSeqNoForRecovery();
     }
 

server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java

@@ -185,10 +185,8 @@ public void testLegacyIndex() throws Exception {
 
         long legacyTranslogGen = randomNonNegativeLong();
         IndexCommit legacyCommit = mockLegacyIndexCommit(translogUUID, legacyTranslogGen);
-        indexPolicy.onCommit(singletonList(legacyCommit));
-        verify(legacyCommit, never()).delete();
-        assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), equalTo(legacyTranslogGen));
-        assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), equalTo(legacyTranslogGen));
+        assertThat(CombinedDeletionPolicy.findSafeCommitPoint(singletonList(legacyCommit), globalCheckpoint.get()),
+            equalTo(legacyCommit));
 
         long safeTranslogGen = randomLongBetween(legacyTranslogGen, Long.MAX_VALUE);
         long maxSeqNo = randomLongBetween(1, Long.MAX_VALUE);