[pulsar] branch master updated: [improve][client] Remove default 30s ackTimeout when setting DLQ policy on java consumer (#19486)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy 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 6bafe8d21bf [improve][client] Remove default 30s ackTimeout when 
setting DLQ policy on java consumer (#19486)
6bafe8d21bf is described below

commit 6bafe8d21bf2b51c32892e12f74719e2b28e2cdd
Author: Kai <kl...@toasttab.com>
AuthorDate: Tue Feb 14 06:08:05 2023 -0800

    [improve][client] Remove default 30s ackTimeout when setting DLQ policy on 
java consumer (#19486)
---
 .../src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java   | 2 --
 .../main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java  | 4 ----
 .../java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java   | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
 
b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
index 8978584b2b4..14a94cb8286 100644
--- 
a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
+++ 
b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
@@ -602,8 +602,6 @@ public interface ConsumerBuilder<T> extends Cloneable {
      *              .build())
      *          .subscribe();
      * </pre>
-     * When a dead letter policy is specified, and no ackTimeoutMillis is 
specified,
-     * then the acknowledgment timeout is set to 30000 milliseconds.
      */
     ConsumerBuilder<T> deadLetterPolicy(DeadLetterPolicy deadLetterPolicy);
 
diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
index 3eb1ea4c874..f644c6a1839 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
@@ -71,7 +71,6 @@ public class ConsumerBuilderImpl<T> implements 
ConsumerBuilder<T> {
 
     private static final long MIN_ACK_TIMEOUT_MILLIS = 1000;
     private static final long MIN_TICK_TIME_MILLIS = 100;
-    private static final long DEFAULT_ACK_TIMEOUT_MILLIS_FOR_DEAD_LETTER = 
30000L;
 
 
     public ConsumerBuilderImpl(PulsarClientImpl client, Schema<T> schema) {
@@ -440,9 +439,6 @@ public class ConsumerBuilderImpl<T> implements 
ConsumerBuilder<T> {
     @Override
     public ConsumerBuilder<T> deadLetterPolicy(DeadLetterPolicy 
deadLetterPolicy) {
         if (deadLetterPolicy != null) {
-            if (conf.getAckTimeoutMillis() == 0) {
-                
conf.setAckTimeoutMillis(DEFAULT_ACK_TIMEOUT_MILLIS_FOR_DEAD_LETTER);
-            }
             checkArgument(deadLetterPolicy.getMaxRedeliverCount() > 0, 
"MaxRedeliverCount must be > 0.");
         }
         conf.setDeadLetterPolicy(deadLetterPolicy);
diff --git 
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
 
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
index daa3fbf8eba..8dbd23f9c29 100644
--- 
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
+++ 
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
@@ -537,7 +537,7 @@ public class ConsumerBuilderImplTest {
         assertEquals(configurationData.getNegativeAckRedeliveryDelayMicros(), 
TimeUnit.MINUTES.toMicros(1));
         
assertEquals(configurationData.getMaxTotalReceiverQueueSizeAcrossPartitions(), 
50000);
         assertEquals(configurationData.getConsumerName(), "consumer");
-        assertEquals(configurationData.getAckTimeoutMillis(), 30000);
+        assertEquals(configurationData.getAckTimeoutMillis(), 0);
         assertEquals(configurationData.getTickDurationMillis(), 1000);
         assertEquals(configurationData.getPriorityLevel(), 0);
         assertEquals(configurationData.getMaxPendingChunkedMessage(), 10);