You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/23 00:13:22 UTC
[1/2] storm git commit: fix code in KafkaSpoutRetryExponentialBackoff
in storm-kafka-client
Repository: storm
Updated Branches:
refs/heads/master dad9db972 -> 038664188
fix code in KafkaSpoutRetryExponentialBackoff in storm-kafka-client
* Closes #1629
* also fix document to use simpler method
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd29b2af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd29b2af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd29b2af
Branch: refs/heads/master
Commit: fd29b2af553d0601a8a954c4f0f0f81966962a38
Parents: dad9db9
Author: leedohyun <le...@gmail.com>
Authored: Wed Aug 17 15:51:51 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 23 09:10:56 2016 +0900
----------------------------------------------------------------------
external/storm-kafka-client/README.md | 2 +-
.../storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java | 2 +-
.../kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd29b2af/external/storm-kafka-client/README.md
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/README.md b/external/storm-kafka-client/README.md
index 7436388..15d5f94 100644
--- a/external/storm-kafka-client/README.md
+++ b/external/storm-kafka-client/README.md
@@ -35,7 +35,7 @@ kafkaConsumerProps.put(KafkaSpoutConfig.Consumer.GROUP_ID,"kafkaSpoutTestGroup")
kafkaConsumerProps.put(KafkaSpoutConfig.Consumer.KEY_DESERIALIZER,"org.apache.kafka.common.serialization.StringDeserializer");
kafkaConsumerProps.put(KafkaSpoutConfig.Consumer.VALUE_DESERIALIZER,"org.apache.kafka.common.serialization.StringDeserializer");
-KafkaSpoutRetryService retryService = new KafkaSpoutRetryExponentialBackoff(new KafkaSpoutRetryExponentialBackoff.TimeInterval(500, TimeUnit.MICROSECONDS),
+KafkaSpoutRetryService retryService = new KafkaSpoutRetryExponentialBackoff(KafkaSpoutRetryExponentialBackoff.TimeInterval.microSeconds(500),
KafkaSpoutRetryExponentialBackoff.TimeInterval.milliSeconds(2), Integer.MAX_VALUE, KafkaSpoutRetryExponentialBackoff.TimeInterval.seconds(10));
```
http://git-wip-us.apache.org/repos/asf/storm/blob/fd29b2af/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
index 6fe997c..f59367d 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
@@ -117,7 +117,7 @@ public class KafkaSpoutRetryExponentialBackoff implements KafkaSpoutRetryService
}
public static TimeInterval microSeconds(long length) {
- return new TimeInterval(length, TimeUnit.MILLISECONDS);
+ return new TimeInterval(length, TimeUnit.MICROSECONDS);
}
public long lengthNanos() {
http://git-wip-us.apache.org/repos/asf/storm/blob/fd29b2af/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java
index 952c5d3..5a78137 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/test/KafkaSpoutTopologyMainNamedTopics.java
@@ -104,14 +104,10 @@ public class KafkaSpoutTopologyMainNamedTopics {
}
protected KafkaSpoutRetryService getRetryService() {
- return new KafkaSpoutRetryExponentialBackoff(getTimeInterval(500, TimeUnit.MICROSECONDS),
+ return new KafkaSpoutRetryExponentialBackoff(TimeInterval.microSeconds(500),
TimeInterval.milliSeconds(2), Integer.MAX_VALUE, TimeInterval.seconds(10));
}
- protected TimeInterval getTimeInterval(long delay, TimeUnit timeUnit) {
- return new TimeInterval(delay, timeUnit);
- }
-
protected Map<String,Object> getKafkaConsumerProps() {
Map<String, Object> props = new HashMap<>();
// props.put(KafkaSpoutConfig.Consumer.ENABLE_AUTO_COMMIT, "true");
[2/2] storm git commit: add Dohyun Lee to contributor
Posted by ka...@apache.org.
add Dohyun Lee to contributor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/03866418
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/03866418
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/03866418
Branch: refs/heads/master
Commit: 038664188bbe3f056a24a0ab3f2ab11080c61c5b
Parents: fd29b2a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 23 09:13:05 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 23 09:13:05 2016 +0900
----------------------------------------------------------------------
README.markdown | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/03866418/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index a965ec2..ffe1b907 100644
--- a/README.markdown
+++ b/README.markdown
@@ -270,6 +270,7 @@ under the License.
* Slava Andreyev ([@slava92](https://github.com/slava92))
* Pavel Grochal ([@Darkless012](https://github.com/Darkless012))
* Manikumar Reddy O ([@omkreddy](https://github.com/omkreddy))
+* Dohyun Lee ([@leedohyun](https://github.com/leedohyun))
## Acknowledgements