Add maxUnackedMessagesPerSubscription and maxUnackedMessagesPerConsumer on namespaces policies #5936

@sijie I took a look, maybe not solve my previous comment. I think @wolfstudy can add a unit test to ensure the dispatcher can handle the policy update. because your current unit test works on zookeeper (write policy data to zookeeper and get policy data from zookeeper), this does not ensure that the dispatcher can work well with policy update.

sijie · 2020-01-18T21:30:11Z

@wolfstudy can you please take a look at @codelipenghui 's comments?

wolfstudy · 2020-01-20T02:53:57Z

@wolfstudy can you please take a look at @codelipenghui 's comments?

Of course, will fix it

Signed-off-by: xiaolong.ran <[email protected]>

codelipenghui · 2020-01-20T14:45:23Z

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java

@@ -454,6 +454,14 @@ protected void mergeNamespaceWithDefaults(Policies policies, String namespace, S
            policies.max_consumers_per_subscription = config.getMaxConsumersPerSubscription();
        }

+        if (policies.max_unacked_messages_per_consumer < 1) {


Suggested change

if (policies.max_unacked_messages_per_consumer < 1) {

if (policies.max_unacked_messages_per_consumer == -1) {

codelipenghui · 2020-01-20T14:45:37Z

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java

+            policies.max_unacked_messages_per_consumer = config.getMaxUnackedMessagesPerConsumer();
+        }
+
+        if (policies.max_unacked_messages_per_subscription < 1) {


Suggested change

if (policies.max_unacked_messages_per_subscription < 1) {

if (policies.max_unacked_messages_per_subscription == -1) {

codelipenghui

Looks good to me, just a minor comment about merge polices method when get polices

codelipenghui · 2020-01-20T14:52:57Z

@sijie I suggest @wolfstudy to change the default value of maxUnackedMessagesPerSubscription and maxUnackMessagesPerConsumer to -1 in namespace policy, because 0 means disabled in broker.conf. Only non negative value can update policy when broker get policy update notifications. Please help take a look.

Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy · 2020-01-21T13:15:08Z

ping @sijie PTAL thanks

Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy · 2020-01-21T16:12:01Z

run java8 tests

wolfstudy · 2020-01-21T16:42:22Z

run java8 tests

Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy · 2020-01-22T04:49:00Z

@sijie the docs fixed done, PTAL

wolfstudy · 2020-01-22T05:39:03Z

run integration tests
run java8 tests

codelipenghui · 2020-01-22T14:17:14Z

retest this please

codelipenghui · 2020-01-22T14:19:45Z

run java8 tests

wolfstudy · 2020-01-30T11:10:52Z

run java8 tests

wolfstudy · 2020-02-01T03:19:07Z

run java8 tests

wolfstudy · 2020-02-01T05:24:26Z

org.apache.pulsar.broker.admin.AdminApiOffloadTest.testOffloadV1
org.apache.pulsar.broker.admin.AdminApiTest.namespaces
org.apache.pulsar.broker.admin.v1.V1_AdminApiTest.namespaces
org.apache.pulsar.client.api.DispatcherBlockConsumerTest.testBlockDispatcherStats

run java8 tests

Signed-off-by: xiaolong.ran <[email protected]>

Anonymitaet · 2020-06-10T09:13:36Z

Doc has been added: https://pulsar.apache.org/docs/en/next/pulsar-admin/#get-max-unacked-messages-per-consumer

…er on namespaces policies (apache#5936) * Add maxUnackedMessagesPerSubscription and maxUnackedMessagesPerConsumer on namespaces policies Signed-off-by: xiaolong.ran <[email protected]> * update admin cli docs Signed-off-by: xiaolong.ran <[email protected]> * add test case Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * add test case for max unacked messages Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * fix no space issue Signed-off-by: xiaolong.ran <[email protected]>

Add maxUnackedMessagesPerSubscription and maxUnackedMessagesPerConsum…

8e77bfb

…er on namespaces policies Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy requested review from sijie, codelipenghui, rdhabalia and jiazhai December 25, 2019 07:40

wolfstudy self-assigned this Dec 25, 2019

wolfstudy added the area/cli label Dec 25, 2019

wolfstudy added 2 commits December 25, 2019 15:47

update admin cli docs

fa5a6da

Signed-off-by: xiaolong.ran <[email protected]>

add test case

5967dd9

Signed-off-by: xiaolong.ran <[email protected]>

codelipenghui reviewed Dec 26, 2019

View reviewed changes

wolfstudy added 2 commits December 26, 2019 14:04

fix comments

c28e11e

Signed-off-by: xiaolong.ran <[email protected]>

fix comments

7af8799

Signed-off-by: xiaolong.ran <[email protected]>

sijie approved these changes Jan 13, 2020

View reviewed changes

wolfstudy added 5 commits January 20, 2020 15:10

add test case for max unacked messages

480a933

Signed-off-by: xiaolong.ran <[email protected]>

fix comments

80f802a

Signed-off-by: xiaolong.ran <[email protected]>

fix comments

f1d04a0

Signed-off-by: xiaolong.ran <[email protected]>

Merge branch 'master' into xiaolong/add-unack-message-per-consumer

7d4651e

fix comments

854bf9b

Signed-off-by: xiaolong.ran <[email protected]>

codelipenghui reviewed Jan 20, 2020

View reviewed changes

fix comments

4467c2f

Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy added 2 commits January 21, 2020 22:26

fix comments

e65fefe

Signed-off-by: xiaolong.ran <[email protected]>

merge master code and fix conflicts

c70f9db

Signed-off-by: xiaolong.ran <[email protected]>

sijie added the doc-required Your PR changes impact docs and you will update later. label Jan 22, 2020

fix docs

2715225

Signed-off-by: xiaolong.ran <[email protected]>

codelipenghui approved these changes Jan 28, 2020

View reviewed changes

wolfstudy added 4 commits February 3, 2020 11:40

fix test case

4232052

Signed-off-by: xiaolong.ran <[email protected]>

fix test case

ff861fb

Signed-off-by: xiaolong.ran <[email protected]>

fix no space issue

02c00b6

Signed-off-by: xiaolong.ran <[email protected]>

merge master code and fix conflict

c6e6827

Signed-off-by: xiaolong.ran <[email protected]>

wolfstudy merged commit 4ea02a3 into apache:master Feb 3, 2020

wolfstudy deleted the xiaolong/add-unack-message-per-consumer branch February 3, 2020 14:10

wolfstudy mentioned this pull request Feb 4, 2020

Config maxUnackMessagesPerConsumer and maxUnackMessagesPerSubscription on a namespace #2939

Closed

sijie added this to the 2.6.0 milestone Feb 16, 2020

sijie mentioned this pull request May 20, 2020

[discussion] Pulsar release 2.6.0 #5819

Closed

Anonymitaet removed the doc-required Your PR changes impact docs and you will update later. label Jun 10, 2020

	if (policies.max_unacked_messages_per_consumer < 1) {
	if (policies.max_unacked_messages_per_consumer == -1) {

	if (policies.max_unacked_messages_per_subscription < 1) {
	if (policies.max_unacked_messages_per_subscription == -1) {

Add maxUnackedMessagesPerSubscription and maxUnackedMessagesPerConsumer on namespaces policies #5936

Add maxUnackedMessagesPerSubscription and maxUnackedMessagesPerConsumer on namespaces policies #5936

Uh oh!

Conversation

wolfstudy commented Dec 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Modifications

Uh oh!

wolfstudy commented Dec 25, 2019

Uh oh!

codelipenghui left a comment

Choose a reason for hiding this comment

Uh oh!

wolfstudy commented Dec 26, 2019

Uh oh!

wolfstudy commented Dec 27, 2019

Uh oh!

sijie commented Jan 13, 2020

Uh oh!

sijie commented Jan 13, 2020

Uh oh!

codelipenghui commented Jan 16, 2020

Uh oh!

sijie commented Jan 18, 2020

Uh oh!

wolfstudy commented Jan 20, 2020

Uh oh!

codelipenghui Jan 20, 2020

Choose a reason for hiding this comment

Uh oh!

codelipenghui Jan 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codelipenghui left a comment

Choose a reason for hiding this comment

Uh oh!

codelipenghui commented Jan 20, 2020

Uh oh!

wolfstudy commented Jan 21, 2020

Uh oh!

wolfstudy commented Jan 21, 2020

Uh oh!

wolfstudy commented Jan 21, 2020

Uh oh!

wolfstudy commented Jan 22, 2020

Uh oh!

wolfstudy commented Jan 22, 2020

Uh oh!

codelipenghui commented Jan 22, 2020

Uh oh!

codelipenghui commented Jan 22, 2020

Uh oh!

wolfstudy commented Jan 30, 2020

Uh oh!

wolfstudy commented Feb 1, 2020

Uh oh!

wolfstudy commented Feb 1, 2020

Uh oh!

Anonymitaet commented Jun 10, 2020

Uh oh!

Uh oh!

wolfstudy commented Dec 25, 2019 •

edited

Loading

codelipenghui Jan 20, 2020 •

edited

Loading