You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2021/01/08 17:34:10 UTC
[pulsar] branch master updated: fix wrong default value (#9149)
This is an automated email from the ASF dual-hosted git repository.
sijie 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 4090fa4 fix wrong default value (#9149)
4090fa4 is described below
commit 4090fa4ad9b46558669ccd44a4658106de2ca46d
Author: feynmanlin <fe...@tencent.com>
AuthorDate: Sat Jan 9 01:33:39 2021 +0800
fix wrong default value (#9149)
Master Issue: #9146
### Motivation
In namespace-level policy, the default value returned is wrong when the user does not set any value
### Modifications
Returns the true default value instead of broker-level
---
.../apache/pulsar/broker/admin/impl/NamespacesBase.java | 17 ++---------------
.../org/apache/pulsar/broker/admin/AdminApiTest.java | 2 +-
.../org/apache/pulsar/broker/admin/AdminApiTest2.java | 2 +-
.../apache/pulsar/broker/admin/v1/V1_AdminApiTest.java | 2 +-
.../apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java | 2 +-
5 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index 20397b8..b00d0ad 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -1587,9 +1587,6 @@ public abstract class NamespacesBase extends AdminResource {
Policies policies = getNamespacePolicies(namespaceName);
DispatchRate dispatchRate = policies.topicDispatchRate.get(pulsar().getConfiguration().getClusterName());
- if (dispatchRate == null) {
- dispatchRate = policies.clusterDispatchRate.get(pulsar().getConfiguration().getClusterName());
- }
if (dispatchRate != null) {
return dispatchRate;
} else {
@@ -1914,12 +1911,7 @@ public abstract class NamespacesBase extends AdminResource {
validateNamespacePolicyOperation(namespaceName, PolicyName.PERSISTENCE, PolicyOperation.READ);
Policies policies = getNamespacePolicies(namespaceName);
- if (policies.persistence == null) {
- return new PersistencePolicies(config().getManagedLedgerDefaultEnsembleSize(),
- config().getManagedLedgerDefaultWriteQuorum(), config().getManagedLedgerDefaultAckQuorum(), 0.0d);
- } else {
- return policies.persistence;
- }
+ return policies.persistence;
}
protected void internalClearNamespaceBacklog(AsyncResponse asyncResponse, boolean authoritative) {
@@ -2386,12 +2378,7 @@ public abstract class NamespacesBase extends AdminResource {
validateNamespacePolicyOperation(namespaceName, PolicyName.RETENTION, PolicyOperation.READ);
Policies policies = getNamespacePolicies(namespaceName);
- if (policies.retention_policies == null) {
- return new RetentionPolicies(config().getDefaultRetentionTimeInMinutes(),
- config().getDefaultRetentionSizeInMB());
- } else {
- return policies.retention_policies;
- }
+ return policies.retention_policies;
}
private boolean checkQuotas(Policies policies, RetentionPolicies retention) {
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 de6c1a2..72be5e1 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
@@ -718,7 +718,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
policies.auth_policies.namespace_auth.remove("my-role");
assertEquals(admin.namespaces().getPolicies("prop-xyz/ns1"), policies);
- assertEquals(admin.namespaces().getPersistence("prop-xyz/ns1"), new PersistencePolicies(2, 2, 2, 0.0));
+ assertEquals(admin.namespaces().getPersistence("prop-xyz/ns1"), null);
admin.namespaces().setPersistence("prop-xyz/ns1", new PersistencePolicies(3, 2, 1, 10.0));
assertEquals(admin.namespaces().getPersistence("prop-xyz/ns1"), new PersistencePolicies(3, 2, 1, 10.0));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
index 849881b..5eee200 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
@@ -310,7 +310,7 @@ public class AdminApiTest2 extends MockedPulsarServiceBaseTest {
final String namespace = "prop-xyz/ns2";
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
- assertEquals(admin.namespaces().getPersistence(namespace), new PersistencePolicies(2, 2, 2, 0.0));
+ assertEquals(admin.namespaces().getPersistence(namespace), null);
admin.namespaces().setPersistence(namespace, new PersistencePolicies(3, 3, 3, 10.0));
assertEquals(admin.namespaces().getPersistence(namespace), new PersistencePolicies(3, 3, 3, 10.0));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
index 6d686ef..b202ffc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
@@ -659,7 +659,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
policies.auth_policies.namespace_auth.remove("my-role");
assertEquals(admin.namespaces().getPolicies("prop-xyz/use/ns1"), policies);
- assertEquals(admin.namespaces().getPersistence("prop-xyz/use/ns1"), new PersistencePolicies(2, 2, 2, 0.0));
+ assertEquals(admin.namespaces().getPersistence("prop-xyz/use/ns1"), null);
admin.namespaces().setPersistence("prop-xyz/use/ns1", new PersistencePolicies(3, 2, 1, 10.0));
assertEquals(admin.namespaces().getPersistence("prop-xyz/use/ns1"), new PersistencePolicies(3, 2, 1, 10.0));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
index e9c4bcf..e797eb8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
@@ -292,7 +292,7 @@ public class V1_AdminApiTest2 extends MockedPulsarServiceBaseTest {
final String namespace = "prop-xyz/use/ns2";
admin.namespaces().createNamespace(namespace);
- assertEquals(admin.namespaces().getPersistence(namespace), new PersistencePolicies(2, 2, 2, 0.0));
+ assertEquals(admin.namespaces().getPersistence(namespace), null);
admin.namespaces().setPersistence(namespace, new PersistencePolicies(3, 3, 3, 10.0));
assertEquals(admin.namespaces().getPersistence(namespace), new PersistencePolicies(3, 3, 3, 10.0));