merlimat closed pull request #3092: Fix process of calculating msgBacklog
included in stats
URL: https://github.com/apache/pulsar/pull/3092
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index 4085f80354..35cd1b7de4 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -694,7 +694,7 @@ public long getNumberOfEntriesInBacklog() {
long backlog =
ManagedLedgerImpl.ENTRIES_ADDED_COUNTER_UPDATER.get(ledger) -
messagesConsumedCounter;
if (backlog < 0) {
// In some case the counters get incorrect values, fall back to
the precise backlog count
- backlog = getNumberOfEntries(Range.closed(markDeletePosition,
ledger.getLastPosition()));
+ backlog = getNumberOfEntries(Range.closed(markDeletePosition,
ledger.getLastPosition())) - 1;
}
return backlog;
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index d8c48ded3b..6d900160b7 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -28,6 +28,7 @@
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import java.lang.reflect.Field;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
@@ -276,6 +277,36 @@ void testNumberOfEntriesInBacklog() throws Exception {
assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
}
+ @Test(timeOut = 20000)
+ void testNumberOfEntriesInBacklogWithFallback() throws Exception {
+ ManagedLedger ledger = factory.open("my_test_ledger", new
ManagedLedgerConfig().setMaxEntriesPerLedger(2));
+
+ ManagedCursor c1 = ledger.openCursor("c1");
+ ledger.addEntry("dummy-entry-1".getBytes(Encoding));
+ ManagedCursor c2 = ledger.openCursor("c2");
+ ledger.addEntry("dummy-entry-2".getBytes(Encoding));
+ ManagedCursor c3 = ledger.openCursor("c3");
+ ledger.addEntry("dummy-entry-3".getBytes(Encoding));
+ ManagedCursor c4 = ledger.openCursor("c4");
+ ledger.addEntry("dummy-entry-4".getBytes(Encoding));
+ ManagedCursor c5 = ledger.openCursor("c5");
+
+ Field field =
ManagedCursorImpl.class.getDeclaredField("messagesConsumedCounter");
+ field.setAccessible(true);
+ long counter = ((ManagedLedgerImpl) ledger).getEntriesAddedCounter() +
1;
+ field.setLong(c1, counter);
+ field.setLong(c2, counter);
+ field.setLong(c3, counter);
+ field.setLong(c4, counter);
+ field.setLong(c5, counter);
+
+ assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+ assertEquals(c2.getNumberOfEntriesInBacklog(), 3);
+ assertEquals(c3.getNumberOfEntriesInBacklog(), 2);
+ assertEquals(c4.getNumberOfEntriesInBacklog(), 1);
+ assertEquals(c5.getNumberOfEntriesInBacklog(), 0);
+ }
+
@Test(timeOut = 20000)
void testNumberOfEntriesWithReopen() throws Exception {
ManagedLedger ledger = factory.open("my_test_ledger", new
ManagedLedgerConfig().setMaxEntriesPerLedger(1));
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
