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/08/14 15:43:58 UTC
[1/3] storm git commit: STORM-742 Let ShellBolt treat all messages to
update heartbeat
Repository: storm
Updated Branches:
refs/heads/master d7155d7be -> 5966ff3c5
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/b8150125
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b8150125
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b8150125
Branch: refs/heads/master
Commit: b815012509e15a68bdd72cc684ab5cc91dd53b86
Parents: bc530b4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Apr 1 07:02:09 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Apr 1 07:02:09 2015 +0900
----------------------------------------------------------------------
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/b8150125/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 308ec67..96eddfe 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -321,9 +321,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());
[2/3] storm git commit: Merge branch 'STORM-742' of
https://github.com/HeartSaVioR/storm into STORM-742
Posted by bo...@apache.org.
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/9973e470
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9973e470
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9973e470
Branch: refs/heads/master
Commit: 9973e47016beafed6ea23cc57619a69811c13fd8
Parents: d7155d7 b815012
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Aug 14 08:24:46 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Aug 14 08:24:46 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/9973e470/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-742 to Changelog
Posted by bo...@apache.org.
Added STORM-742 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5966ff3c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5966ff3c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5966ff3c
Branch: refs/heads/master
Commit: 5966ff3c5c2709d51cbbf3274a0a9d0be1d8c707
Parents: 9973e47
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Aug 14 08:33:05 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Aug 14 08:33:05 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5966ff3c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f8edb0..5d3ec03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
* STORM-139: hashCode does not work for byte[]
* STORM-860: UI: while topology is transitioned to killed, "Activate" button is enabled but not functioning
* STORM-966: ConfigValidation.DoubleValidator doesn't really validate whether the type of the object is a double
+ * STORM-742: Let ShellBolt treat all messages to update heartbeat
## 0.10.0-beta1
* STORM-873: Flux does not handle diamond topologies