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 2016/03/04 18:49:38 UTC

[1/2] storm git commit: Merge branch 'storm1543' of https://github.com/kishorvpatil/incubator-storm

Repository: storm
Updated Branches:
  refs/heads/1.x-branch af50c2538 -> 8d216926a


Merge branch 'storm1543' 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/5ad37373
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5ad37373
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5ad37373

Branch: refs/heads/1.x-branch
Commit: 5ad3737366907a0fa0c8198d93d2951911a45dad
Parents: af50c25
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 17:34:41 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 17:45:21 2016 +0000

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/5ad37373/storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java
index e500c7d..791fc91 100644
--- a/storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java
+++ b/storm-core/src/jvm/org/apache/storm/drpc/DRPCSpout.java
@@ -182,6 +182,8 @@ public class DRPCSpout extends BaseRichSpout {
                     client = _clients.get(i);
                 }
                 if (!client.isConnected()) {
+                    LOG.warn("DRPCInvocationsClient [{}:{}] is not connected.", client.getHost(), client.getPort());
+                    reconnect(client);
                     continue;
                 }
                 try {


[2/2] storm git commit: Added STORM-1543 ot Changelog

Posted by ki...@apache.org.
Added STORM-1543 ot Changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8d216926
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8d216926
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8d216926

Branch: refs/heads/1.x-branch
Commit: 8d216926ade3d1e358b016a851fd6348ec54a286
Parents: 5ad3737
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 17:46:17 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 17:46:17 2016 +0000

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8d216926/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 481b803..7257aa8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.0
+ * STORM-1543: DRPCSpout should always try to reconnect disconnected DRPCInvocationsClient
  * STORM-1561: Supervisor should relaunch worker if assignments have changed
  * STORM-1601: Check if /backpressure/storm-id node exists before requesting children
  * STORM-1574: Better handle backpressure exception etc.