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/07/08 07:22:27 UTC
[1/3] storm git commit: initialize lastHeartbeatTimestamp before
starting heartbeat task
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 1beb76188 -> 5ef9534e5
initialize lastHeartbeatTimestamp before starting heartbeat task
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dae20521
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dae20521
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dae20521
Branch: refs/heads/1.0.x-branch
Commit: dae20521489abba2aac3a7e33186c787fcdfd815
Parents: 1beb761
Author: Slava Andreyev <sa...@ets.org>
Authored: Wed Jul 6 13:14:09 2016 -0400
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 8 16:21:39 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/task/ShellBolt.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dae20521/storm-core/src/jvm/org/apache/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/task/ShellBolt.java b/storm-core/src/jvm/org/apache/storm/task/ShellBolt.java
index 47b0763..1b3a0e5 100644
--- a/storm-core/src/jvm/org/apache/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/org/apache/storm/task/ShellBolt.java
@@ -138,11 +138,11 @@ public class ShellBolt implements IBolt {
_writerThread = new Thread(new BoltWriterRunnable());
_writerThread.start();
- heartBeatExecutorService = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1));
- heartBeatExecutorService.scheduleAtFixedRate(new BoltHeartbeatTimerTask(this), 1, 1, TimeUnit.SECONDS);
-
LOG.info("Start checking heartbeat...");
setHeartbeat();
+
+ heartBeatExecutorService = MoreExecutors.getExitingScheduledExecutorService(new ScheduledThreadPoolExecutor(1));
+ heartBeatExecutorService.scheduleAtFixedRate(new BoltHeartbeatTimerTask(this), 1, 1, TimeUnit.SECONDS);
}
public void execute(Tuple input) {
[2/3] storm git commit: Merge branch 'STORM-1946-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-1946-1.0.x' 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/c22fd16d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c22fd16d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c22fd16d
Branch: refs/heads/1.0.x-branch
Commit: c22fd16d26e7b434a94de9f5ff28881a9dcf85ad
Parents: 1beb761 dae2052
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 8 16:21:50 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 8 16:21:50 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/task/ShellBolt.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1946 to CHANGELOG
Posted by ka...@apache.org.
add STORM-1946 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5ef9534e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5ef9534e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5ef9534e
Branch: refs/heads/1.0.x-branch
Commit: 5ef9534e5a3618c0d626cdbdc0db60fd4d6d7904
Parents: c22fd16
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 8 16:22:10 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 8 16:22:10 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5ef9534e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba9ad26..32f1c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
-## 1.0.3
-
## 1.0.2
+ * STORM-1946: initialize lastHeartbeatTimestamp before starting heartbeat task
* STORM-1941 Nimbus discovery can fail when zookeeper reconnect happens
* STORM-1937 Fix WindowTridentProcessor cause NullPointerException
* STORM-1924: Add a config file parameter to HDFS test topologies