This is an automated email from the ASF dual-hosted git repository.
rxl pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 0a2df5a5c0309d561b2d15d1451ceaed951935ec
Author: ran <gaoran...@126.com>
AuthorDate: Thu Jul 9 00:43:31 2020 +0800
[Issue 7347] Avoid the NPE occurs in method
`ManagedLedgerImpl.isOffloadedNeedsDelete` (#7389)
Fixes #7347
### Motivation
The default value of the offload-deletion-lag is `null`, this will cause an
NPE problem.
### Modifications
Add null check in the method `ManagedLedgerImpl.isOffloadedNeedsDelete`.
### Verifying this change
Add unit test for method `ManagedLedgerImpl.isOffloadedNeedsDelete`.
(cherry picked from commit eaf268cb3717df242a8e17b5cadb6babc1a7099c)
---
.../bookkeeper/mledger/impl/ManagedLedgerImpl.java | 4 +-
.../mledger/impl/OffloadLedgerDeleteTest.java | 62 ++++++++++++++++++++--
.../bookkeeper/mledger/impl/OffloadPrefixTest.java | 2 +-
3 files changed, 63 insertions(+), 5 deletions(-)
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
index f45b341..ea0614d 100644
---
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
@@ -1960,7 +1960,9 @@ public class ManagedLedgerImpl implements ManagedLedger,
CreateCallback {
long elapsedMs = clock.millis() - offload.getTimestamp();
if (config.getLedgerOffloader() != null && config.getLedgerOffloader()
!= NullLedgerOffloader.INSTANCE
- && config.getLedgerOffloader().getOffloadPolicies() != null) {
+ && config.getLedgerOffloader().getOffloadPolicies() != null
+ && config.getLedgerOffloader().getOffloadPolicies()
+ .getManagedLedgerOffloadDeletionLagInMillis() != null) {
return offload.getComplete() && !offload.getBookkeeperDeleted()
&& elapsedMs > config.getLedgerOffloader()
.getOffloadPolicies().getManagedLedgerOffloadDeletionLagInMillis();
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
index 8fbc588..736cd8b 100644
---
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
@@ -20,15 +20,21 @@ package org.apache.bookkeeper.mledger.impl;
import static
org.apache.bookkeeper.mledger.impl.OffloadPrefixTest.assertEventuallyTrue;
+import java.lang.reflect.Method;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.bookkeeper.mledger.LedgerOffloader;
import org.apache.bookkeeper.mledger.ManagedCursor;
+import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
+import org.apache.bookkeeper.mledger.proto.MLDataFormats;
import org.apache.bookkeeper.mledger.util.MockClock;
import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
+import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +54,7 @@ public class OffloadLedgerDeleteTest extends
MockedBookKeeperTestCase {
config.setMinimumRolloverTime(0, TimeUnit.SECONDS);
config.setRetentionTime(10, TimeUnit.MINUTES);
config.setRetentionSizeInMB(10);
-
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(new
Long(300000));
+
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(300000L);
config.setLedgerOffloader(offloader);
config.setClock(clock);
@@ -110,7 +116,7 @@ public class OffloadLedgerDeleteTest extends
MockedBookKeeperTestCase {
config.setMinimumRolloverTime(0, TimeUnit.SECONDS);
config.setRetentionTime(5, TimeUnit.MINUTES);
config.setRetentionSizeInMB(10);
-
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(new
Long(600000));
+
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(600000L);
config.setLedgerOffloader(offloader);
config.setClock(clock);
@@ -157,7 +163,7 @@ public class OffloadLedgerDeleteTest extends
MockedBookKeeperTestCase {
config.setMaxEntriesPerLedger(10);
config.setMinimumRolloverTime(0, TimeUnit.SECONDS);
config.setRetentionTime(10, TimeUnit.MINUTES);
-
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(new
Long(300000));
+
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(300000L);
config.setLedgerOffloader(offloader);
config.setClock(clock);
@@ -201,4 +207,54 @@ public class OffloadLedgerDeleteTest extends
MockedBookKeeperTestCase {
.map(e ->
e.getLedgerId()).collect(Collectors.toSet()),
offloader.offloadedLedgers());
}
+
+ @Test
+ public void isOffloadedNeedsDeleteTest() throws Exception {
+ OffloadPolicies offloadPolicies = new OffloadPolicies();
+ LedgerOffloader ledgerOffloader = Mockito.mock(LedgerOffloader.class);
+
Mockito.when(ledgerOffloader.getOffloadPolicies()).thenReturn(offloadPolicies);
+
+ ManagedLedgerConfig config = new ManagedLedgerConfig();
+ MockClock clock = new MockClock();
+ config.setLedgerOffloader(ledgerOffloader);
+ config.setClock(clock);
+
+ ManagedLedger managedLedger =
factory.open("isOffloadedNeedsDeleteTest", config);
+ Class<ManagedLedgerImpl> clazz = ManagedLedgerImpl.class;
+ Method method = clazz.getDeclaredMethod("isOffloadedNeedsDelete",
MLDataFormats.OffloadContext.class);
+ method.setAccessible(true);
+
+ MLDataFormats.OffloadContext offloadContext =
MLDataFormats.OffloadContext.newBuilder()
+ .setTimestamp(config.getClock().millis() - 1000)
+ .setComplete(true)
+ .setBookkeeperDeleted(false)
+ .build();
+ Boolean needsDelete = (Boolean) method.invoke(managedLedger,
offloadContext);
+ Assert.assertFalse(needsDelete);
+
+ offloadPolicies.setManagedLedgerOffloadDeletionLagInMillis(500L);
+ needsDelete = (Boolean) method.invoke(managedLedger, offloadContext);
+ Assert.assertTrue(needsDelete);
+
+ offloadPolicies.setManagedLedgerOffloadDeletionLagInMillis(1000L * 2);
+ needsDelete = (Boolean) method.invoke(managedLedger, offloadContext);
+ Assert.assertFalse(needsDelete);
+
+ offloadContext = MLDataFormats.OffloadContext.newBuilder()
+ .setTimestamp(config.getClock().millis() - 1000)
+ .setComplete(false)
+ .setBookkeeperDeleted(false)
+ .build();
+ needsDelete = (Boolean) method.invoke(managedLedger, offloadContext);
+ Assert.assertFalse(needsDelete);
+
+ offloadContext = MLDataFormats.OffloadContext.newBuilder()
+ .setTimestamp(config.getClock().millis() - 1000)
+ .setComplete(true)
+ .setBookkeeperDeleted(true)
+ .build();
+ needsDelete = (Boolean) method.invoke(managedLedger, offloadContext);
+ Assert.assertFalse(needsDelete);
+
+ }
}
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
index 97bab56..d2d4148 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
@@ -608,7 +608,7 @@ public class OffloadPrefixTest extends
MockedBookKeeperTestCase {
config.setMaxEntriesPerLedger(10);
config.setMinimumRolloverTime(0, TimeUnit.SECONDS);
config.setRetentionTime(0, TimeUnit.MINUTES);
-
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(new
Long(100));
+
offloader.getOffloadPolicies().setManagedLedgerOffloadDeletionLagInMillis(100L);
offloader.getOffloadPolicies().setManagedLedgerOffloadThresholdInBytes(100);
config.setLedgerOffloader(offloader);
ManagedLedgerImpl ledger =
(ManagedLedgerImpl)factory.open("my_test_ledger", config);
