storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/2] storm git commit: Merge branch 'STORM-742' of https://github.com/HeartSaVioR/storm into STORM-742
Date Fri, 14 Aug 2015 13:44:35 GMT
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch 02d9b836b -> 2b0ec2465


Merge branch 'STORM-742' of https://github.com/HeartSaVioR/storm into STORM-742

STORM-742: Let ShellBolt treat all messages to update heartbeat


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

Branch: refs/heads/0.10.x-branch
Commit: a784ae7cc70866090db1e8c1e7aa1e5986148af1
Parents: 02d9b83
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Fri Aug 14 08:24:46 2015 -0500
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Fri Aug 14 08:34:35 2015 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/task/ShellBolt.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a784ae7c/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index eac8a90..53b9ce9 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -324,9 +324,11 @@ public class ShellBolt implements IBolt {
                     if (command == null) {
                         throw new IllegalArgumentException("Command not found in bolt message:
" + shellMsg);
                     }
-                    if (command.equals("sync")) {
-                        setHeartbeat();
-                    } else if(command.equals("ack")) {
+
+                    setHeartbeat();
+
+                    // We don't need to take care of sync, cause we're always updating heartbeat
+                    if(command.equals("ack")) {
                         handleAck(shellMsg.getId());
                     } else if (command.equals("fail")) {
                         handleFail(shellMsg.getId());


Mime
View raw message