Skip to content

Read entry error should print lastAddConfirmed in the log #2707

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 8, 2021
Merged

Read entry error should print lastAddConfirmed in the log #2707

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
96432f6
Read entry error should print lastAddConfirmed in the log
merlimat May 6, 2021
54bbe64
Fixed test expectation of the log message
merlimat May 7, 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
8 changes: 4 additions & 4 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,8 @@ public void asyncReadEntries(long firstEntry, long lastEntry, ReadCallback cb, O
}

if (lastEntry > lastAddConfirmed) {
LOG.error("ReadException on ledgerId:{} firstEntry:{} lastEntry:{}",
ledgerId, firstEntry, lastEntry);
LOG.error("ReadEntries exception on ledgerId:{} firstEntry:{} lastEntry:{} lastAddConfirmed:{}",
ledgerId, firstEntry, lastEntry, lastAddConfirmed);
cb.readComplete(BKException.Code.ReadException, this, null, ctx);
return;
}
Expand Down Expand Up @@ -751,8 +751,8 @@ public CompletableFuture<LedgerEntries> readAsync(long firstEntry, long lastEntr
}

if (lastEntry > lastAddConfirmed) {
LOG.error("ReadException on ledgerId:{} firstEntry:{} lastEntry:{}",
ledgerId, firstEntry, lastEntry);
LOG.error("ReadAsync exception on ledgerId:{} firstEntry:{} lastEntry:{} lastAddConfirmed:{}",
ledgerId, firstEntry, lastEntry, lastAddConfirmed);
return FutureUtils.exception(new BKReadException());
}

Expand Down
4 changes: 2 additions & 2 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public void testReadEntryBeyondLac() throws Exception {
} catch (BKException.BKReadException e) {
// pass
}
assertLogWithMdc("ledger_read_entry", "ReadException on ledgerId:0 firstEntry:100 lastEntry:100");
assertLogWithMdc("ledger_read_entry", "ReadEntries exception on ledgerId:0 firstEntry:100 lastEntry:100");
}

@Test
Expand All @@ -245,7 +245,7 @@ public void testReadFromDeletedLedger() throws Exception {
} catch (BKException.BKReadException e) {
// pass
}
assertLogWithMdc("ledger_read_entry", "ReadException on ledgerId:0 firstEntry:100 lastEntry:100");
assertLogWithMdc("ledger_read_entry", "ReadEntries exception on ledgerId:0 firstEntry:100 lastEntry:100");
}

}