You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/10/15 16:12:22 UTC
[1/4] storm git commit: Netty should not limit attempts to reconnect
Repository: storm
Updated Branches:
refs/heads/master 93043e66c -> 9fe97b6ea
Netty should not limit attempts to reconnect
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7b4f4d7b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7b4f4d7b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7b4f4d7b
Branch: refs/heads/master
Commit: 7b4f4d7b71e72c5e5be24de8e70e893ebb741ec2
Parents: 04cf3f6
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Oct 12 16:31:24 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Oct 12 16:31:24 2015 +0000
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7b4f4d7b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 8697907..d52baea 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -171,7 +171,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
}
private boolean reconnectingAllowed() {
- return !closing && connectionAttempts.get() <= (maxReconnectionAttempts + 1);
+ return !closing;
}
private boolean connectionEstablished(Channel channel) {
[4/4] storm git commit: Added STORM-1106 to Changelog
Posted by ki...@apache.org.
Added STORM-1106 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9fe97b6e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9fe97b6e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9fe97b6e
Branch: refs/heads/master
Commit: 9fe97b6ea8fa84a34f846291735acac8d6399107
Parents: 4b4c245
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Oct 14 23:16:38 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Oct 14 23:16:38 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9fe97b6e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5578808..0cc9686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1106: Netty should not limit attempts to reconnect
* STORM-1103: Changes log message to DEBUG from INFO
* STORM-1104: Nimbus HA fails to find newly downloaded code files
* STORM-1087: Avoid issues with transfer-queue backpressure.
[3/4] storm git commit: Merge branch 'storm1106' of
https://github.com/kishorvpatil/incubator-storm
Posted by ki...@apache.org.
Merge branch 'storm1106' of https://github.com/kishorvpatil/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4b4c2451
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4b4c2451
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4b4c2451
Branch: refs/heads/master
Commit: 4b4c2451915c2741fa2f60c69bc9de942cef807a
Parents: 93043e6 5a29b30
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Oct 14 23:14:17 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Oct 14 23:14:17 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 ++
.../src/jvm/backtype/storm/messaging/netty/Client.java | 10 ++--------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: Deprecate configuration
Config.STORM_MESSAGING_NETTY_MAX_RETRIES
Posted by ki...@apache.org.
Deprecate configuration Config.STORM_MESSAGING_NETTY_MAX_RETRIES
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5a29b302
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5a29b302
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5a29b302
Branch: refs/heads/master
Commit: 5a29b30212a5f0e15c6e791758f86eb2bb8a6aa4
Parents: 7b4f4d7
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Oct 12 11:49:02 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Oct 12 16:49:39 2015 +0000
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 ++
.../src/jvm/backtype/storm/messaging/netty/Client.java | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5a29b302/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 26a6681..fcdc8ad 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -73,7 +73,9 @@ public class Config extends HashMap<String, Object> {
/**
* Netty based messaging: The max # of retries that a peer will perform when a remote is not accessible
+ *@deprecated "Since netty clients should never stop reconnecting - this does not make sense anymore.
*/
+ @Deprecated
public static final String STORM_MESSAGING_NETTY_MAX_RETRIES = "storm.messaging.netty.max_retries";
public static final Object STORM_MESSAGING_NETTY_MAX_RETRIES_SCHEMA = ConfigValidation.IntegerValidator;
http://git-wip-us.apache.org/repos/asf/storm/blob/5a29b302/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index d52baea..2149c0d 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -79,12 +79,6 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
*/
private final AtomicReference<Channel> channelRef = new AtomicReference<Channel>();
-
- /**
- * Maximum number of reconnection attempts we will perform after a disconnect before giving up.
- */
- private final int maxReconnectionAttempts;
-
/**
* Total number of connection attempts.
*/
@@ -134,7 +128,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
LOG.info("creating Netty Client, connecting to {}:{}, bufferSize: {}", host, port, bufferSize);
int messageBatchSize = Utils.getInt(stormConf.get(Config.STORM_NETTY_MESSAGE_BATCH_SIZE), 262144);
- maxReconnectionAttempts = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_RETRIES));
+ int maxReconnectionAttempts = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_RETRIES));
int minWaitMs = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MIN_SLEEP_MS));
int maxWaitMs = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_SLEEP_MS));
retryPolicy = new StormBoundedExponentialBackoffRetry(minWaitMs, maxWaitMs, maxReconnectionAttempts);