You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/11 18:02:28 UTC
[1/4] storm git commit: Fixing STORM-1432
Repository: storm
Updated Branches:
refs/heads/master 24f03e570 -> 58af76601
Fixing STORM-1432
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6712e8d7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6712e8d7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6712e8d7
Branch: refs/heads/master
Commit: 6712e8d7e4cf48e045eb0d46187291296d99a1f2
Parents: aff4704
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Tue Jan 5 12:22:23 2016 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Tue Jan 5 12:22:23 2016 -0600
----------------------------------------------------------------------
.../test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6712e8d7/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java b/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
index 11ad5b7..a30887c 100644
--- a/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
@@ -163,9 +163,9 @@ public class ExponentialBackoffMsgRetryManagerTest {
@Test
public void testMaxBackoff() throws Exception {
- final long initial = 10;
+ final long initial = 100;
final double mult = 2d;
- final long max = 20;
+ final long max = 2000;
ExponentialBackoffMsgRetryManager manager = new ExponentialBackoffMsgRetryManager(initial, mult, max);
long expectedWaitTime = initial;
[4/4] storm git commit: Added STORM-1432 to Changelog
Posted by bo...@apache.org.
Added STORM-1432 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/58af7660
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/58af7660
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/58af7660
Branch: refs/heads/master
Commit: 58af7660104ba094c9ae7d080ab9d6e3fc32eee0
Parents: 5f78f25
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 10:53:10 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 10:53:10 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/58af7660/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7b644c..636d54f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1432: Spurious failure in storm-kafka test
* STORM-1449: Fix Kafka spout to maintain backward compatibility
* STORM-1458: Add check to see if nimbus is already running.
* STORM-1462: Upgrade HikariCP to 2.4.3
[2/4] storm git commit: Fixing other Kafka test.
Posted by bo...@apache.org.
Fixing other Kafka test.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/91343205
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/91343205
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/91343205
Branch: refs/heads/master
Commit: 91343205d36eb1f245883d4dd370b9dba91e6a90
Parents: 6712e8d
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Tue Jan 5 13:07:27 2016 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Tue Jan 5 13:07:27 2016 -0600
----------------------------------------------------------------------
.../test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/91343205/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java b/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
index a30887c..da23718 100644
--- a/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/ExponentialBackoffMsgRetryManagerTest.java
@@ -50,14 +50,14 @@ public class ExponentialBackoffMsgRetryManagerTest {
@Test
public void testSingleDelay() throws Exception {
- ExponentialBackoffMsgRetryManager manager = new ExponentialBackoffMsgRetryManager(10, 1d, 100);
+ ExponentialBackoffMsgRetryManager manager = new ExponentialBackoffMsgRetryManager(100, 1d, 1000);
manager.failed(TEST_OFFSET);
Thread.sleep(5);
Long next = manager.nextFailedMessageToRetry();
assertNull("expect no message ready for retry yet", next);
assertFalse("message should not be ready for retry yet", manager.shouldRetryMsg(TEST_OFFSET));
- Thread.sleep(10);
+ Thread.sleep(100);
next = manager.nextFailedMessageToRetry();
assertEquals("expect test offset next available for retry", TEST_OFFSET, next);
assertTrue("message should be ready for retry", manager.shouldRetryMsg(TEST_OFFSET));
[3/4] storm git commit: Merge branch 'STORM-1432' of
https://github.com/knusbaum/incubator-storm into STORM-1432
Posted by bo...@apache.org.
Merge branch 'STORM-1432' of https://github.com/knusbaum/incubator-storm into STORM-1432
STORM-1432: Spurious failure in storm-kafka test
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5f78f258
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5f78f258
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5f78f258
Branch: refs/heads/master
Commit: 5f78f25824e31066c7288917659173df89c7c277
Parents: 24f03e5 9134320
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 11 10:52:42 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 11 10:52:42 2016 -0600
----------------------------------------------------------------------
.../storm/kafka/ExponentialBackoffMsgRetryManagerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------