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 2015/01/14 17:05:32 UTC
[11/44] storm git commit: make config names more consistent with each
other
make config names more consistent with each other
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/79e3efe2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/79e3efe2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/79e3efe2
Branch: refs/heads/master
Commit: 79e3efe2558d252f2122facdb0ce5e69c9c62104
Parents: 0533676
Author: Rick Kilgore <ri...@hbo.com>
Authored: Tue Sep 9 14:52:37 2014 -0700
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Tue Sep 9 14:52:37 2014 -0700
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 4 ++--
external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/79e3efe2/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index e80b19a..02edf31 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -290,7 +290,7 @@ public class PartitionManager {
* <ul>
* <li>retryInitialDelayMs - time to delay before the first retry</li>
* <li>retryDelayMultiplier - multiplier by which to increase the delay for each subsequent retry</li>
- * <li>retryMaxDelayMs - maximum retry delay (once this delay time is reached, subsequent retries will
+ * <li>retryDelayMaxMs - maximum retry delay (once this delay time is reached, subsequent retries will
* delay for this amount of time every time)
* </li>
* </ul>
@@ -315,7 +315,7 @@ public class PartitionManager {
public boolean isReadyForRetry() {
double delayMultiplier = Math.pow(_spoutConfig.retryDelayMultiplier, this.attemptsAlreadyPerformed - 1);
long delayThisRetryMs = (long) (_spoutConfig.retryInitialDelayMs * delayMultiplier);
- delayThisRetryMs = Math.min(delayThisRetryMs, _spoutConfig.retryMaxDelayMs);
+ delayThisRetryMs = Math.min(delayThisRetryMs, _spoutConfig.retryDelayMaxMs);
return new Date().getTime() - this.failTimeUTC > delayThisRetryMs;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/79e3efe2/external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java b/external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java
index 5a5d6f4..fbc887f 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java
@@ -32,7 +32,7 @@ public class SpoutConfig extends KafkaConfig implements Serializable {
// appropriately to prevent resubmitting the message while still retrying
public long retryInitialDelayMs = 0;
public double retryDelayMultiplier = 1.0;
- public long retryMaxDelayMs = 60 * 1000;
+ public long retryDelayMaxMs = 60 * 1000;
public SpoutConfig(BrokerHosts hosts, String topic, String zkRoot, String id) {
super(hosts, topic);