Skip to content

Fix publish callback's entry data is null during ledger rollover #10467

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
merlimat merged 2 commits into from
May 3, 2021
Merged

Fix publish callback's entry data is null during ledger rollover #10467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d418e
Fix publish callback's entry data is null during ledger rollover
BewareMyPower May 2, 2021
d059897
Don't call recycle() when the callback is null
BewareMyPower May 2, 2021
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
10 changes: 6 additions & 4 deletions managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpAddEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,17 @@ public void safeRun() {
ml.lastConfirmedEntry = lastEntry;

if (closeWhenDone) {
ReferenceCountUtil.release(data);
log.info("[{}] Closing ledger {} for being full", ml.getName(), ledger.getId());
// `data` will be released in `closeComplete`
ledger.asyncClose(this, ctx);
} else {
updateLatency();
AddEntryCallback cb = callbackUpdater.getAndSet(this, null);
if (cb != null) {
cb.addComplete(lastEntry, data.asReadOnly(), ctx);
ReferenceCountUtil.release(data);
ml.notifyCursors();
ml.notifyWaitingEntryCallBacks();
ReferenceCountUtil.release(data);
this.recycle();
} else {
ReferenceCountUtil.release(data);
Expand All @@ -231,10 +231,13 @@ public void closeComplete(int rc, LedgerHandle lh, Object ctx) {

AddEntryCallback cb = callbackUpdater.getAndSet(this, null);
if (cb != null) {
cb.addComplete(PositionImpl.get(lh.getId(), entryId), null, ctx);
cb.addComplete(PositionImpl.get(lh.getId(), entryId), data.asReadOnly(), ctx);
ml.notifyCursors();
ml.notifyWaitingEntryCallBacks();
ReferenceCountUtil.release(data);
this.recycle();
} else {
ReferenceCountUtil.release(data);
}
}

Expand Down Expand Up @@ -345,5 +348,4 @@ public String toString() {
", dataLength=" + dataLength +
'}';
}

}
17 changes: 11 additions & 6 deletions managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,13 +552,15 @@ private byte[] copyBytesFromByteBuf(final ByteBuf buf) {

@Test(timeOut = 20000)
public void asyncAddEntryWithoutError() throws Exception {
ManagedLedger ledger = factory.open("my_test_ledger");
ManagedLedger ledger = factory.open("my_test_ledger",
new ManagedLedgerConfig().setMaxEntriesPerLedger(2));
ledger.openCursor("test-cursor");

final CountDownLatch counter = new CountDownLatch(1);
final int count = 4;
final CountDownLatch counter = new CountDownLatch(count);

final byte[] bytes = "dummy-entry-1".getBytes(Encoding);
ledger.asyncAddEntry(bytes, new AddEntryCallback() {
AddEntryCallback callback = new AddEntryCallback() {
@Override
public void addComplete(Position position, ByteBuf entryData, Object ctx) {
assertNull(ctx);
Expand All @@ -579,11 +581,14 @@ public void addFailed(ManagedLedgerException exception, Object ctx) {
fail(exception.getMessage());
}

}, null);
};
for (int i = 0; i < count; i++) {
ledger.asyncAddEntry(bytes, callback, null);
}

counter.await();
assertEquals(ledger.getNumberOfEntries(), 1);
assertEquals(ledger.getTotalSize(), "dummy-entry-1".getBytes(Encoding).length);
assertEquals(ledger.getNumberOfEntries(), count);
assertEquals(ledger.getTotalSize(), "dummy-entry-1".getBytes(Encoding).length * count);
}

@Test(timeOut = 20000)
Expand Down