You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/06/10 19:23:38 UTC
[1/3] storm git commit: STORM-1705: Fix cap-retry bug
Repository: storm
Updated Branches:
refs/heads/1.x-branch 478babe45 -> a59007db5
refs/heads/master 582418952 -> ded5a0df1
STORM-1705: Fix cap-retry bug
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a59695e9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a59695e9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a59695e9
Branch: refs/heads/1.x-branch
Commit: a59695e97953dc68b798f01df92c49b6df4b6abd
Parents: 5c706af
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Fri Jun 10 21:18:40 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Fri Jun 10 21:18:40 2016 +0530
----------------------------------------------------------------------
.../org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a59695e9/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
index b2cfaf0..cacf73c 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
@@ -106,7 +106,6 @@ public class ExponentialBackoffMsgRetryManager implements FailedMsgRetryManager
MessageRetryRecord record = this.records.get(offset);
return ! (record != null &&
this.retryLimit > 0 &&
- this.waiting.contains(record) &&
this.retryLimit <= record.retryNum);
}
[2/3] storm git commit: Merge branch 'cap-retry' of
github.com:abhishekagarwal87/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch 'cap-retry' of github.com:abhishekagarwal87/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a59007db
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a59007db
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a59007db
Branch: refs/heads/1.x-branch
Commit: a59007db5b0e34d352925dff61f65d951d1c9cf3
Parents: 478babe a59695e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jun 10 14:01:42 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 10 14:01:42 2016 -0400
----------------------------------------------------------------------
.../org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-1705: Fix cap-retry bug
Posted by pt...@apache.org.
STORM-1705: Fix cap-retry bug
Signed-off-by: P. Taylor Goetz <pt...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ded5a0df
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ded5a0df
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ded5a0df
Branch: refs/heads/master
Commit: ded5a0df1510313ae2dce8869dbabaad6567452d
Parents: 5824189
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Fri Jun 10 21:18:40 2016 +0530
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 10 14:02:02 2016 -0400
----------------------------------------------------------------------
.../org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ded5a0df/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
index b2cfaf0..cacf73c 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java
@@ -106,7 +106,6 @@ public class ExponentialBackoffMsgRetryManager implements FailedMsgRetryManager
MessageRetryRecord record = this.records.get(offset);
return ! (record != null &&
this.retryLimit > 0 &&
- this.waiting.contains(record) &&
this.retryLimit <= record.retryNum);
}