This is an automated email from the ASF dual-hosted git repository.
mmarshall pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new e75c9601813 Revert "[improve] [admin] Make the default value of param
--get-subscription-backlog-size of admin API topics stats true (#19302)"
e75c9601813 is described below
commit e75c9601813f43ce884edc5365abd7cb546f6fe4
Author: Michael Marshall <[email protected]>
AuthorDate: Mon Feb 27 16:33:23 2023 -0600
Revert "[improve] [admin] Make the default value of param
--get-subscription-backlog-size of admin API topics stats true (#19302)"
This reverts commit 3095b6a4bc038c6d134e9193bd05c3cb3bb81644.
---
.../java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java | 4 ++--
.../pulsar/broker/service/persistent/PersistentSubscription.java | 2 --
.../src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java | 7 ++-----
.../test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java | 6 +++---
.../src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java | 6 +++---
.../pulsar/common/policies/data/stats/SubscriptionStatsImpl.java | 2 +-
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
index 08185bb2970..e60baa1c2dd 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
@@ -1136,7 +1136,7 @@ public class PersistentTopics extends
PersistentTopicsBase {
@QueryParam("getPreciseBacklog") @DefaultValue("false") boolean
getPreciseBacklog,
@ApiParam(value = "If return backlog size for each subscription,
require locking on ledger so be careful "
+ "not to use when there's heavy traffic.")
- @QueryParam("subscriptionBacklogSize") @DefaultValue("true")
boolean subscriptionBacklogSize,
+ @QueryParam("subscriptionBacklogSize") @DefaultValue("false")
boolean subscriptionBacklogSize,
@ApiParam(value = "If return time of the earliest message in
backlog")
@QueryParam("getEarliestTimeInBacklog") @DefaultValue("false")
boolean getEarliestTimeInBacklog) {
validateTopicName(tenant, namespace, encodedTopic);
@@ -1238,7 +1238,7 @@ public class PersistentTopics extends
PersistentTopicsBase {
@QueryParam("getPreciseBacklog") @DefaultValue("false") boolean
getPreciseBacklog,
@ApiParam(value = "If return backlog size for each subscription,
require locking on ledger so be careful "
+ "not to use when there's heavy traffic.")
- @QueryParam("subscriptionBacklogSize") @DefaultValue("true")
boolean subscriptionBacklogSize,
+ @QueryParam("subscriptionBacklogSize") @DefaultValue("false")
boolean subscriptionBacklogSize,
@ApiParam(value = "If return the earliest time in backlog")
@QueryParam("getEarliestTimeInBacklog") @DefaultValue("false")
boolean getEarliestTimeInBacklog) {
try {
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
index cb22c5c5879..fe3faf35bc9 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -1123,8 +1123,6 @@ public class PersistentSubscription extends
AbstractSubscription implements Subs
if (subscriptionBacklogSize) {
subStats.backlogSize = ((ManagedLedgerImpl)
topic.getManagedLedger())
.getEstimatedBacklogSize((PositionImpl)
cursor.getMarkDeletedPosition());
- } else {
- subStats.backlogSize = -1;
}
if (getEarliestTimeInBacklog && subStats.msgBacklog > 0) {
ManagedLedgerImpl managedLedger = ((ManagedLedgerImpl)
cursor.getManagedLedger());
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index 4611f670dcb..8d58eae59a3 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -1195,16 +1195,14 @@ public class AdminApiTest extends
MockedPulsarServiceBaseTest {
assertEquals(topicStats.getEarliestMsgPublishTimeInBacklogs(), 0);
assertEquals(topicStats.getSubscriptions().get(subName).getEarliestMsgPublishTimeInBacklog(),
0);
-
assertEquals(topicStats.getSubscriptions().get(subName).getBacklogSize(), -1);
// publish several messages
publishMessagesOnPersistentTopic(topic, 10);
Thread.sleep(1000);
- topicStats = admin.topics().getStats(topic, false, true, true);
+ topicStats = admin.topics().getStats(topic, false, false, true);
assertTrue(topicStats.getEarliestMsgPublishTimeInBacklogs() > 0);
assertTrue(topicStats.getSubscriptions().get(subName).getEarliestMsgPublishTimeInBacklog()
> 0);
- assertTrue(topicStats.getSubscriptions().get(subName).getBacklogSize()
> 0);
for (int i = 0; i < 10; i++) {
Message<byte[]> message = consumer.receive();
@@ -1212,10 +1210,9 @@ public class AdminApiTest extends
MockedPulsarServiceBaseTest {
}
Thread.sleep(1000);
- topicStats = admin.topics().getStats(topic, false, true, true);
+ topicStats = admin.topics().getStats(topic, false, false, true);
assertEquals(topicStats.getEarliestMsgPublishTimeInBacklogs(), 0);
assertEquals(topicStats.getSubscriptions().get(subName).getEarliestMsgPublishTimeInBacklog(),
0);
-
assertEquals(topicStats.getSubscriptions().get(subName).getBacklogSize(), 0);
}
diff --git
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index d77f312ff85..0e393c901b4 100644
---
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -1404,7 +1404,7 @@ public class PulsarAdminToolTest {
verify(mockTopics).deleteSubscription("persistent://myprop/clust/ns1/ds1",
"sub1", false);
cmdTopics.run(split("stats persistent://myprop/clust/ns1/ds1"));
- verify(mockTopics).getStats("persistent://myprop/clust/ns1/ds1",
false, true, false);
+ verify(mockTopics).getStats("persistent://myprop/clust/ns1/ds1",
false, false, false);
cmdTopics.run(split("stats-internal
persistent://myprop/clust/ns1/ds1"));
verify(mockTopics).getInternalStats("persistent://myprop/clust/ns1/ds1", false);
@@ -1452,7 +1452,7 @@ public class PulsarAdminToolTest {
cmdTopics.run(split("partitioned-stats
persistent://myprop/clust/ns1/ds1 --per-partition"));
verify(mockTopics).getPartitionedStats("persistent://myprop/clust/ns1/ds1",
- true, false, true, false);
+ true, false, false, false);
cmdTopics.run(split("partitioned-stats-internal
persistent://myprop/clust/ns1/ds1"));
verify(mockTopics).getPartitionedInternalStats("persistent://myprop/clust/ns1/ds1");
@@ -1978,7 +1978,7 @@ public class PulsarAdminToolTest {
CmdTopics topics = new CmdTopics(() -> admin);
topics.run(split("stats non-persistent://myprop/ns1/ds1"));
- verify(mockTopics).getStats("non-persistent://myprop/ns1/ds1", false,
true, false);
+ verify(mockTopics).getStats("non-persistent://myprop/ns1/ds1", false,
false, false);
topics.run(split("stats-internal non-persistent://myprop/ns1/ds1"));
verify(mockTopics).getInternalStats("non-persistent://myprop/ns1/ds1",
false);
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
index c5ac05110bb..4b73703395e 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
@@ -743,8 +743,8 @@ public class CmdTopics extends CmdBase {
@Parameter(names = { "-sbs",
"--get-subscription-backlog-size" }, description = "Set true
to get backlog size for each subscription"
- + ", locking required. If set to false, the attribute 'backlogSize' in
the response will be -1")
- private boolean subscriptionBacklogSize = true;
+ + ", locking required.")
+ private boolean subscriptionBacklogSize = false;
@Parameter(names = { "-etb",
"--get-earliest-time-in-backlog" }, description = "Set true to
get earliest time in backlog")
@@ -809,7 +809,7 @@ public class CmdTopics extends CmdBase {
@Parameter(names = { "-sbs",
"--get-subscription-backlog-size" }, description = "Set true
to get backlog size for each subscription"
+ ", locking required.")
- private boolean subscriptionBacklogSize = true;
+ private boolean subscriptionBacklogSize = false;
@Parameter(names = { "-etb",
"--get-earliest-time-in-backlog" }, description = "Set true to
get earliest time in backlog")
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
index 48f2cf24ffd..02e1e8e184b 100644
---
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
+++
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/SubscriptionStatsImpl.java
@@ -58,7 +58,7 @@ public class SubscriptionStatsImpl implements
SubscriptionStats {
/** Number of entries in the subscription backlog. */
public long msgBacklog;
- /** Size of backlog in byte, -1 means that the argument
"subscriptionBacklogSize" is false when calling the API. **/
+ /** Size of backlog in byte. **/
public long backlogSize;
/** Get the publish time of the earliest message in the backlog. */
