forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow to enable/disable delayed delivery for messages on namespace (a…
…pache#5915) * Allow to enable/disable delyed delivery for messages on namespace Signed-off-by: xiaolong.ran <[email protected]> * add isDelayedDeliveryEnabled function Signed-off-by: xiaolong.ran <[email protected]> * add delayed_delivery_time process logic Signed-off-by: xiaolong.ran <[email protected]> * add test case Signed-off-by: xiaolong.ran <[email protected]> * update admin cli docs Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * update import lib Signed-off-by: xiaolong.ran <[email protected]> * avoid import * Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * remove unuse code Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * add test case for delayed delivery messages Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]> * fix comments Signed-off-by: xiaolong.ran <[email protected]>
- Loading branch information
Showing
15 changed files
with
434 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDelivery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.pulsar.broker.admin; | ||
|
|
||
| import com.google.common.collect.Sets; | ||
| import lombok.Cleanup; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; | ||
| import org.apache.pulsar.client.api.*; | ||
| import org.apache.pulsar.common.policies.data.ClusterData; | ||
| import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies; | ||
| import org.apache.pulsar.common.policies.data.TenantInfo; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.testng.annotations.AfterMethod; | ||
| import org.testng.annotations.BeforeMethod; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.util.Set; | ||
| import java.util.TreeSet; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import static org.testng.Assert.*; | ||
|
|
||
| @Slf4j | ||
| public class AdminApiDelayedDelivery extends MockedPulsarServiceBaseTest { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(AdminApiDelayedDelivery.class); | ||
|
|
||
| @BeforeMethod | ||
| @Override | ||
| public void setup() throws Exception { | ||
| super.internalSetup(); | ||
|
|
||
| admin.clusters().createCluster("test", new ClusterData(pulsar.getWebServiceAddress())); | ||
| TenantInfo tenantInfo = new TenantInfo(Sets.newHashSet("role1", "role2"), Sets.newHashSet("test")); | ||
| admin.tenants().createTenant("delayed-delivery-messages", tenantInfo); | ||
| } | ||
|
|
||
| @AfterMethod | ||
| @Override | ||
| public void cleanup() throws Exception { | ||
| super.internalCleanup(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDisableDelayedDelivery() throws Exception { | ||
| admin.namespaces().createNamespace("delayed-delivery-messages/default-ns"); | ||
| String namespace = "delayed-delivery-messages/default-ns"; | ||
| assertTrue(admin.namespaces().getDelayedDelivery(namespace).isActive()); | ||
|
|
||
| DelayedDeliveryPolicies delayedDeliveryPolicies = new DelayedDeliveryPolicies(2000, false); | ||
| admin.namespaces().setDelayedDeliveryMessages(namespace, delayedDeliveryPolicies); | ||
|
|
||
| assertFalse(admin.namespaces().getDelayedDelivery(namespace).isActive()); | ||
| assertEquals(2000, admin.namespaces().getDelayedDelivery(namespace).getTickTime()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEnableDelayedDeliveryMessages() throws Exception { | ||
| admin.namespaces().createNamespace("delayed-delivery-messages/default-enable-service-conf"); | ||
| String namespace = "delayed-delivery-messages/default-enable-service-conf"; | ||
| String topicName = "persistent://delayed-delivery-messages/default-enable-service-conf/test"; | ||
| assertTrue(admin.namespaces().getDelayedDelivery(namespace).isActive()); | ||
|
|
||
| @Cleanup | ||
| Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING) | ||
| .topic(topicName) | ||
| .subscriptionName("test-sub") | ||
| .subscriptionType(SubscriptionType.Shared) | ||
| .subscribe(); | ||
|
|
||
| @Cleanup | ||
| Producer<String> producer = pulsarClient.newProducer(Schema.STRING) | ||
| .topic(topicName) | ||
| .create(); | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| producer.newMessage() | ||
| .value("delayed-msg-" + i) | ||
| .deliverAfter(5, TimeUnit.SECONDS) | ||
| .sendAsync(); | ||
| } | ||
|
|
||
| producer.flush(); | ||
|
|
||
| // Delayed messages might not come in same exact order | ||
| Set<String> delayedMessages = new TreeSet<>(); | ||
| for (int i = 0; i < 10; i++) { | ||
| Message<String> msg = consumer.receive(10, TimeUnit.SECONDS); | ||
| delayedMessages.add(msg.getValue()); | ||
| consumer.acknowledge(msg); | ||
| } | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| assertTrue(delayedMessages.contains("delayed-msg-" + i)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.