You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/12/06 23:15:00 UTC
[1/3] storm git commit: fix actiavte and deactive heartbeat problem
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch a06f52105 -> d56e76c16
fix actiavte and deactive heartbeat problem
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0fd5ef1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0fd5ef1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0fd5ef1e
Branch: refs/heads/1.0.x-branch
Commit: 0fd5ef1efa24de9e2f90b238c98a91967b5bd43d
Parents: a06f521
Author: itiel <It...@forter.com>
Authored: Sat Dec 3 18:45:04 2016 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Dec 7 08:14:23 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0fd5ef1e/storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java b/storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java
index 451cfd1..903c3b1 100644
--- a/storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java
@@ -254,6 +254,10 @@ public class ShellSpout implements ISpout {
LOG.info("Start checking heartbeat...");
// prevent timer to check heartbeat based on last thing before activate
setHeartbeat();
+ if (heartBeatExecutorService.isShutdown()){
+ //In case deactivate was called before
+ heartBeatExecutorService = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1));
+ }
heartBeatExecutorService.scheduleAtFixedRate(new SpoutHeartbeatTimerTask(this), 1, 1, TimeUnit.SECONDS);
}
[2/3] storm git commit: Merge branch 'STORM-2234-1.0.x-merge' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2234-1.0.x-merge' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/639bfb5a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/639bfb5a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/639bfb5a
Branch: refs/heads/1.0.x-branch
Commit: 639bfb5a97f78b87f023ffa873d4fdc43a3b67ab
Parents: a06f521 0fd5ef1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Dec 7 08:14:33 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Dec 7 08:14:33 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/spout/ShellSpout.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: STORM-2234: CHANGELOG
Posted by ka...@apache.org.
STORM-2234: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d56e76c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d56e76c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d56e76c1
Branch: refs/heads/1.0.x-branch
Commit: d56e76c16cd214e4516c83358fbbe07d57ae346f
Parents: 639bfb5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Dec 7 08:14:46 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Dec 7 08:14:46 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d56e76c1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01abc1d..13dc4d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2234: heartBeatExecutorService in shellSpout don't work well with deactivate
* STORM-2216: Favor JSONValue.parseWithException
* STORM-2208: HDFS State Throws FileNotFoundException in Azure Data Lake Store file system (adl://)
* STORM-2213: ShellSpout has race condition when ShellSpout is being inactive longer than heartbeat timeout