[fix][broker]Incorrect backlog that is larger than expected (apache#25037)

(cherry picked from commit 587031e)

Author: poorbarcode

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java

@@ -3785,6 +3785,7 @@ public long getNumberOfEntries(Range<Position> range) {
             // than the LAC.
             // To support this case, use "Long.MAX_VALUE" if the ledger is the last one.
             long entriesInLedger = comparePositions(toPosition, lastConfirmedEntry) >= 0
+                    || toPosition.getLedgerId() == lastConfirmedEntry.getLedgerId()
                     ? Long.MAX_VALUE : toLedger.getEntries();
             count += Math.min(toPosition.getEntryId(), entriesInLedger - 1);
             count += toIncluded ? 1 : 0;
@@ -3793,12 +3794,12 @@ public long getNumberOfEntries(Range<Position> range) {
         // 2. Add the entries in the ledger pointed by fromPosition.
         //    Add nothing if "toPosition.entryId < 0".
         //    Add nothing if "toPosition" does not exit in "ledgers".
-        LedgerInfo formLedger = ledgers.get(fromPosition.getLedgerId());
-        if (formLedger != null) {
+        LedgerInfo fromLedger = ledgers.get(fromPosition.getLedgerId());
+        if (fromLedger != null) {
             if (fromPosition.getEntryId() < 0) {
-                count += formLedger.getEntries();
+                count += fromLedger.getEntries();
             } else {
-                count += formLedger.getEntries() - (fromPosition.getEntryId() + 1);
+                count += fromLedger.getEntries() - (fromPosition.getEntryId() + 1);
                 count += fromIncluded ? 1 : 0;
             }
         }

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java

@@ -4682,13 +4682,15 @@ public void testGetNumberOfEntriesWithRangeParam() throws Exception {
         assertEquals(ml.getNumberOfEntries(range26), 29);
 
         // Normal case: end with current ledger.
-        Range<Position> range27 = Range.closed(positions.get(0), positions.get(34));
-        assertEquals(ml.getNumberOfEntries(range27), 35);
+        Range<Position> range27 = Range.closed(positions.get(0), positions.get(31));
+        assertEquals(ml.getNumberOfEntries(range27), 32);
+        Range<Position> range28 = Range.closed(positions.get(0), positions.get(34));
+        assertEquals(ml.getNumberOfEntries(range28), 35);
         // Cover the following case.
         // The use case "cursor.getNumberOfEntries()", which will use a "toPosition" that with an entry
         // id that is larger than the LAC.
-        Range<Position> range28 = Range.closed(positions.get(0), PositionFactory.create(ledger4.getLedgerId(), 100));
-        assertEquals(ml.getNumberOfEntries(range28), 131);
+        Range<Position> range29 = Range.closed(positions.get(0), PositionFactory.create(ledger4.getLedgerId(), 100));
+        assertEquals(ml.getNumberOfEntries(range29), 131);
 
         // From position that entry id is "-1" & positions in the same ledger.
         Range<Position> range31 = Range.closed(PositionFactory.create(ledger1.getLedgerId(), -1),