[storm] branch master updated: MINOR: Default Kafka poll timeout is 200ms, not 2s

[srdo]

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

srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new 52989cb  MINOR: Default Kafka poll timeout is 200ms, not 2s
     new 37369fd  Merge branch 'fix-kafka-timeout-comment' of 
https://github.com/srdo/storm into asfgit-master
52989cb is described below

commit 52989cb57660c0d68c137c0a4ddaff46687bc336
Author: Stig Rohde Døssing <s...@apache.org>
AuthorDate: Thu Mar 28 10:46:37 2019 +0100

    MINOR: Default Kafka poll timeout is 200ms, not 2s
---
 .../src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java  | 1 -
 .../org/apache/storm/kafka/spout/internal/CommonKafkaSpoutConfig.java | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
index b6059b5..a51e14c 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 public class KafkaSpoutConfig<K, V> extends CommonKafkaSpoutConfig<K, V> {
 
     private static final long serialVersionUID = 141902646130682494L;
-    // 30s
     public static final long DEFAULT_OFFSET_COMMIT_PERIOD_MS = 30_000;
     // Retry forever
     public static final int DEFAULT_MAX_RETRIES = Integer.MAX_VALUE;
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/CommonKafkaSpoutConfig.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/CommonKafkaSpoutConfig.java
index 9210d09..4e1160f 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/CommonKafkaSpoutConfig.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/CommonKafkaSpoutConfig.java
@@ -43,9 +43,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class CommonKafkaSpoutConfig<K, V> implements Serializable {
-    // 200ms
     public static final long DEFAULT_POLL_TIMEOUT_MS = 200;
-    // 2s
     public static final long DEFAULT_PARTITION_REFRESH_PERIOD_MS = 2_000;
 
     public static final FirstPollOffsetStrategy 
DEFAULT_FIRST_POLL_OFFSET_STRATEGY = 
FirstPollOffsetStrategy.UNCOMMITTED_EARLIEST;
@@ -150,7 +148,7 @@ public abstract class CommonKafkaSpoutConfig<K, V> 
implements Serializable {
 
         //Spout Settings
         /**
-         * Specifies the time, in milliseconds, spent waiting in poll if data 
is not available. Default is 2s.
+         * Specifies the time, in milliseconds, spent waiting in poll if data 
is not available. Default is 200ms.
          *
          * @param pollTimeoutMs time in ms
          */