[improve][offload] Allow to disable the managedLedgerOffloadDeletionL…

…agInMillis (#22689)
apache · May 16, 2024 · 73fd61d · 73fd61d
1 parent 101aee4
commit 73fd61d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -2578,6 +2578,7 @@ boolean isOffloadedNeedsDelete(OffloadContext offload, Optional<OffloadPolicies>
         long elapsedMs = clock.millis() - offload.getTimestamp();
         return offloadPolicies.filter(policies -> offload.getComplete() && !offload.getBookkeeperDeleted()
                 && policies.getManagedLedgerOffloadDeletionLagInMillis() != null
+                && policies.getManagedLedgerOffloadDeletionLagInMillis() >= 0
                 && elapsedMs > policies.getManagedLedgerOffloadDeletionLagInMillis()).isPresent();
     }
 
@@ -4559,4 +4560,4 @@ public Position getTheSlowestNonDurationReadPosition() {
         }
         return theSlowestNonDurableReadPosition;
     }
-}
+}
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
@@ -383,6 +383,10 @@ public void isOffloadedNeedsDeleteTest() throws Exception {
         needsDelete = managedLedger.isOffloadedNeedsDelete(offloadContext, Optional.of(offloadPolicies));
         Assert.assertTrue(needsDelete);
 
+        offloadPolicies.setManagedLedgerOffloadDeletionLagInMillis(-1L);
+        needsDelete = managedLedger.isOffloadedNeedsDelete(offloadContext, Optional.of(offloadPolicies));
+        Assert.assertFalse(needsDelete);
+
         offloadPolicies.setManagedLedgerOffloadDeletionLagInMillis(1000L * 2);
         needsDelete = managedLedger.isOffloadedNeedsDelete(offloadContext, Optional.of(offloadPolicies));
         Assert.assertFalse(needsDelete);