From f172471ddfc56dbdafecebccc3a31f908e4980c7 Mon Sep 17 00:00:00 2001 From: Jai ASher Date: Fri, 19 May 2017 10:19:32 -0700 Subject: [PATCH 1/2] Changed ProducerConfiguration blockIfQueueFull to false by default --- .../java/com/yahoo/pulsar/client/api/ProducerConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-client/src/main/java/com/yahoo/pulsar/client/api/ProducerConfiguration.java b/pulsar-client/src/main/java/com/yahoo/pulsar/client/api/ProducerConfiguration.java index ab905ac1dfc7c..ec7750eabd82b 100644 --- a/pulsar-client/src/main/java/com/yahoo/pulsar/client/api/ProducerConfiguration.java +++ b/pulsar-client/src/main/java/com/yahoo/pulsar/client/api/ProducerConfiguration.java @@ -37,7 +37,7 @@ public class ProducerConfiguration implements Serializable { private static final long serialVersionUID = 1L; private long sendTimeoutMs = 30000; private int maxPendingMessages = 1000; - private boolean blockIfQueueFull = true; + private boolean blockIfQueueFull = false; private MessageRoutingMode messageRouteMode = MessageRoutingMode.SinglePartition; private MessageRouter customMessageRouter = null; private long batchingMaxPublishDelayMs = 10; From ffd2f93c004d633deb244c0a21f7311cba105d71 Mon Sep 17 00:00:00 2001 From: Jai ASher Date: Mon, 22 May 2017 00:50:02 -0700 Subject: [PATCH 2/2] Fixed test cases --- .../com/yahoo/pulsar/broker/service/BatchMessageTest.java | 1 + .../yahoo/pulsar/broker/service/PersistentQueueE2ETest.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BatchMessageTest.java b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BatchMessageTest.java index f5ae5f6fca216..e8b72e4701e5f 100644 --- a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BatchMessageTest.java +++ b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BatchMessageTest.java @@ -350,6 +350,7 @@ public void testSimpleBatchProducerConsumer1kMessages() throws Exception { consumer.close(); ProducerConfiguration producerConf = new ProducerConfiguration(); + producerConf.setMaxPendingMessages(numMsgs + 1); producerConf.setBatchingMaxPublishDelay(30000, TimeUnit.MILLISECONDS); producerConf.setBatchingMaxMessages(numMsgsInBatch); producerConf.setBatchingEnabled(true); diff --git a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/PersistentQueueE2ETest.java b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/PersistentQueueE2ETest.java index 371eefa185e6c..c11a1ff25d5f4 100644 --- a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/PersistentQueueE2ETest.java +++ b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/PersistentQueueE2ETest.java @@ -44,6 +44,7 @@ import com.yahoo.pulsar.client.api.Message; import com.yahoo.pulsar.client.api.MessageId; import com.yahoo.pulsar.client.api.Producer; +import com.yahoo.pulsar.client.api.ProducerConfiguration; import com.yahoo.pulsar.client.api.PulsarClientException; import com.yahoo.pulsar.client.api.SubscriptionType; import com.yahoo.pulsar.client.util.FutureUtil; @@ -261,7 +262,9 @@ public void testConsumersWithDifferentPermits() throws Exception { Consumer consumer2 = pulsarClient.subscribe(topicName, subName, conf2); List> futures = Lists.newArrayListWithCapacity(numMsgs); - Producer producer = pulsarClient.createProducer(topicName); + ProducerConfiguration conf = new ProducerConfiguration(); + conf.setMaxPendingMessages(numMsgs + 1); + Producer producer = pulsarClient.createProducer(topicName, conf); for (int i = 0; i < numMsgs; i++) { String message = "msg-" + i; futures.add(producer.sendAsync(message.getBytes()));