[bookkeeper] branch master updated: Read entry error should print lastAddConfirmed in the log (#2707)

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 87579b0  Read entry error should print lastAddConfirmed in the log 
(#2707)
87579b0 is described below

commit 87579b0a9f18833ee41fcae37582bb68606d68e7
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Fri May 7 17:54:56 2021 -0700

    Read entry error should print lastAddConfirmed in the log (#2707)
    
    * Read entry error should print lastAddConfirmed in the log
    
    * Fixed test expectation of the log message
---
 .../src/main/java/org/apache/bookkeeper/client/LedgerHandle.java  | 8 ++++----
 .../test/java/org/apache/bookkeeper/client/MdcContextTest.java    | 4 ++--
 2 files changed, 6 insertions(+), 6 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 48818bd..661499e 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 class LedgerHandle implements WriteHandle {
         }
 
         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 class LedgerHandle implements WriteHandle {
         }
 
         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());
         }
 
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 89b0088..d50dd96 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 class MdcContextTest extends 
BookKeeperClusterTestCase {
         } 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 class MdcContextTest extends 
BookKeeperClusterTestCase {
         } 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");
     }
 
 }