Merge branch 'STORM-2666-clean-1.x' of https://github.com/srdo/storm into STORM-2666-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/644f5cb9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/644f5cb9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/644f5cb9 Branch: refs/heads/1.x-branch Commit: 644f5cb98d6d5b810ac23a04a01f62edd42c44b7 Parents: e83878a 54fdcbc Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Oct 10 08:10:43 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Oct 10 08:10:43 2017 +0900 ---------------------------------------------------------------------- .../apache/storm/kafka/spout/KafkaSpout.java | 50 +++- .../KafkaSpoutRetryExponentialBackoff.java | 32 +- .../kafka/spout/KafkaSpoutRetryService.java | 6 +- .../kafka/spout/internal/OffsetManager.java | 8 +- .../storm/kafka/spout/KafkaSpoutCommitTest.java | 23 +- .../kafka/spout/KafkaSpoutRebalanceTest.java | 56 +++- .../KafkaSpoutRetryExponentialBackoffTest.java | 292 +++++++++++++++++++ .../kafka/spout/SingleTopicKafkaSpoutTest.java | 62 +++- .../kafka/spout/internal/OffsetManagerTest.java | 84 ++++++ 9 files changed, 556 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
