Skip to content

[Issue 7347] Avoid the NPE occurs in method ManagedLedgerImpl.isOffloadedNeedsDelete #7389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sijie merged 7 commits into from
Jul 8, 2020
Merged

[Issue 7347] Avoid the NPE occurs in method ManagedLedgerImpl.isOffloadedNeedsDelete #7389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
622595f
set the default offload deletion lag value to -1
gaoran10 Jun 30, 2020
f683f88
add unit test for method `ManagedLedgerImpl.isOffloadedNeedsDelete`
gaoran10 Jun 30, 2020
55dda16
fix test
gaoran10 Jun 30, 2020
45f4411
fix test
gaoran10 Jun 30, 2020
7ae01ef
fix
gaoran10 Jul 5, 2020
75e0295
fix
gaoran10 Jul 5, 2020
89a44c9
fix test
gaoran10 Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,9 @@ private boolean isOffloadedNeedsDelete(OffloadContext offload) {
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();
Expand Down
62 changes: 59 additions & 3 deletions managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,21 @@

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;

Expand All @@ -48,7 +54,7 @@ public void testLaggedDelete() throws Exception {
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);

Expand Down Expand Up @@ -110,7 +116,7 @@ public void testLaggedDeleteRetentionSetLower() throws Exception {
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);

Expand Down Expand Up @@ -157,7 +163,7 @@ public void testLaggedDeleteSlowConsumer() throws Exception {
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);

Expand Down Expand Up @@ -201,4 +207,54 @@ public void testLaggedDeleteSlowConsumer() throws Exception {
.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);

}
}
2 changes: 1 addition & 1 deletion managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ public void testOffloadDelete() throws Exception {
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);
Expand Down