From 96432f65d9f9a3158c50d8715f5ee52e3c5b9f1c Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Thu, 6 May 2021 14:23:41 -0700 Subject: [PATCH 1/2] Read entry error should print lastAddConfirmed in the log --- .../java/org/apache/bookkeeper/client/LedgerHandle.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java index 48818bd2f5b..661499e96cb 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java @@ -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; } @@ -751,8 +751,8 @@ public CompletableFuture 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()); } From 54bbe64d7659fcf85e1a18aed0ae247c0226ee34 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Thu, 6 May 2021 18:26:40 -0700 Subject: [PATCH 2/2] Fixed test expectation of the log message --- .../java/org/apache/bookkeeper/client/MdcContextTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java index 89b008836e0..d50dd96fe76 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MdcContextTest.java @@ -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 @@ -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"); } }