You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/09/19 02:29:58 UTC
[pulsar] branch master updated: [fix][broker] Fix namespace backlog quota check with retention. (#17706)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c6967cd37d1 [fix][broker] Fix namespace backlog quota check with retention. (#17706)
c6967cd37d1 is described below
commit c6967cd37d11c01c9cc873233e157c7d1af70c6a
Author: JiangHaiting <ji...@apache.org>
AuthorDate: Mon Sep 19 10:29:51 2022 +0800
[fix][broker] Fix namespace backlog quota check with retention. (#17706)
---
.../apache/pulsar/broker/admin/AdminResource.java | 10 +++++--
.../apache/pulsar/broker/admin/AdminApiTest.java | 32 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
index 1b05df826c9..47c69ecc698 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -370,17 +370,21 @@ public abstract class AdminResource extends PulsarWebResource {
}
protected boolean checkBacklogQuota(BacklogQuota quota, RetentionPolicies retention) {
- if (retention == null || retention.getRetentionSizeInMB() <= 0 || retention.getRetentionTimeInMinutes() <= 0) {
+ if (retention == null
+ || (retention.getRetentionSizeInMB() <= 0 && retention.getRetentionTimeInMinutes() <= 0)) {
return true;
}
if (quota == null) {
quota = pulsar().getBrokerService().getBacklogQuotaManager().getDefaultQuota();
}
- if (quota.getLimitSize() >= (retention.getRetentionSizeInMB() * 1024 * 1024)) {
+
+ if (retention.getRetentionSizeInMB() > 0
+ && quota.getLimitSize() >= (retention.getRetentionSizeInMB() * 1024 * 1024)) {
return false;
}
// time based quota is in second
- if (quota.getLimitTime() >= (retention.getRetentionTimeInMinutes() * 60)) {
+ if (retention.getRetentionTimeInMinutes() > 0
+ && quota.getLimitTime() >= retention.getRetentionTimeInMinutes() * 60) {
return false;
}
return true;
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 9e537d0d294..fe7c13057ba 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
@@ -3406,4 +3406,36 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
long value2 = partitionedStats.getEarliestMsgPublishTimeInBacklogs();
Assert.assertNotEquals(value2, 0);
}
+
+ @Test
+ public void testRetentionAndBacklogQuotaCheck() throws PulsarAdminException {
+ String namespace = "prop-xyz/ns1";
+ //test size check.
+ admin.namespaces().setRetention(namespace, new RetentionPolicies(-1, 10));
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitSize(9 * 1024 * 1024).build());
+ Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, () -> {
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitSize(100 * 1024 * 1024).build());
+ });
+
+ //test time check
+ admin.namespaces().setRetention(namespace, new RetentionPolicies(10, -1));
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitTime(9 * 60).build());
+ Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, () -> {
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitTime(11 * 60).build());
+ });
+
+ // test both size and time.
+ admin.namespaces().setRetention(namespace, new RetentionPolicies(10, 10));
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitSize(9 * 1024 * 1024).build());
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitTime(9 * 60).build());
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitSize(9 * 1024 * 1024).
+ limitTime(9 * 60).build());
+ Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, () -> {
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitSize(100 * 1024 * 1024).build());
+ });
+ Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, () -> {
+ admin.namespaces().setBacklogQuota(namespace, BacklogQuota.builder().limitTime(100 * 60).build());
+ });
+
+ }
}