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 2014/07/29 14:22:40 UTC
[3/5] git commit: Increase max tries and reset local channel variable
Increase max tries and reset local channel variable
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/f1f5ecd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f1f5ecd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f1f5ecd9
Branch: refs/heads/master
Commit: f1f5ecd92c7ea55d01163c8dbc2360466f34fd3a
Parents: 9b3a632
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Thu Jul 24 20:49:22 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Thu Jul 24 20:49:22 2014 +0000
----------------------------------------------------------------------
conf/defaults.yaml | 3 ++-
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/f1f5ecd9/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 8c07075..2864adc 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -108,7 +108,8 @@ zmq.hwm: 0
storm.messaging.netty.server_worker_threads: 1
storm.messaging.netty.client_worker_threads: 1
storm.messaging.netty.buffer_size: 5242880 #5MB buffer
-storm.messaging.netty.max_retries: 120
+# Since nimbus.task.launch.secs and supervisor.worker.start.timeout.secs are 120, other workers should also wait at least that long before giving up on connecting to the other worker.
+storm.messaging.netty.max_retries: 300
storm.messaging.netty.max_wait_ms: 1000
storm.messaging.netty.min_wait_ms: 100
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/f1f5ecd9/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 80b4537..5e4133e 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -207,6 +207,7 @@ public class Client implements IConnection {
while (msgs.hasNext()) {
if (!channel.isConnected()) {
connect();
+ channel = channelRef.get();
}
TaskMessage message = msgs.next();
if (null == messageBatch) {
@@ -351,3 +352,4 @@ public class Client implements IConnection {
});
}
}
+