[kafka] branch trunk updated: KAFKA-6399: Remove Streams max.poll.interval override (#6509)

[bb...@apache.org]

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

bbejeck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9bd0d6a  KAFKA-6399: Remove Streams max.poll.interval override (#6509)
9bd0d6a is described below

commit 9bd0d6aa93b901be97adb53f290b262c7cf1f175
Author: John Roesler <vv...@users.noreply.github.com>
AuthorDate: Thu Apr 4 08:38:25 2019 -0500

    KAFKA-6399: Remove Streams max.poll.interval override (#6509)
    
    Since we now call poll during restore, we can decrease the timeout
    to a reasonable value, which should help Streams make progress if
    threads get stuck.
    
    Reviewers: Guozhang Wang <wa...@gmail.com>,  Bill Bejeck <bb...@gmail.com>
---
 streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java b/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
index f607d1d..f3e6386 100644
--- a/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
+++ b/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java
@@ -719,13 +719,6 @@ public class StreamsConfig extends AbstractConfig {
         tempConsumerDefaultOverrides.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
         tempConsumerDefaultOverrides.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "false");
         tempConsumerDefaultOverrides.put("internal.leave.group.on.close", false);
-        // MAX_POLL_INTERVAL_MS_CONFIG needs to be large for streams to handle cases when
-        // streams is recovering data from state stores. We may set it to Integer.MAX_VALUE since
-        // the streams code itself catches most exceptions and acts accordingly without needing
-        // this timeout. Note however that deadlocks are not detected (by definition) so we
-        // are losing the ability to detect them by setting this value to large. Hopefully
-        // deadlocks happen very rarely or never.
-        tempConsumerDefaultOverrides.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, Integer.toString(Integer.MAX_VALUE));
         CONSUMER_DEFAULT_OVERRIDES = Collections.unmodifiableMap(tempConsumerDefaultOverrides);
     }