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 2015/10/17 15:35:24 UTC
[1/3] storm git commit: STORM-1102: Add a default flush interval for
HiveBolt
Repository: storm
Updated Branches:
refs/heads/master e954d0af0 -> 379ab8043
STORM-1102: Add a default flush interval for HiveBolt
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9a25aede
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9a25aede
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9a25aede
Branch: refs/heads/master
Commit: 9a25aede1791bba48dbb345fb2523e1484b4db8c
Parents: 86f2d03
Author: Aaron Dossett <aa...@target.com>
Authored: Fri Oct 9 13:27:03 2015 -0500
Committer: Aaron Dossett <aa...@target.com>
Committed: Fri Oct 9 13:29:28 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9a25aede/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
index e20d31f..d8685b0 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java
@@ -93,6 +93,15 @@ public class HiveBolt extends BaseRichBolt {
new ThreadFactoryBuilder().setNameFormat(timeoutName).build());
heartBeatTimer = new Timer();
setupHeartBeatTimer();
+
+ // If interval is non-zero then it has already been explicitly set and we should not default it
+ if (conf.containsKey("topology.message.timeout.secs") && options.getTickTupleInterval() == 0)
+ {
+ Integer topologyTimeout = Integer.parseInt(conf.get("topology.message.timeout.secs").toString());
+ int tickTupleInterval = (int) (Math.floor(topologyTimeout / 2));
+ options.withTickTupleInterval(tickTupleInterval);
+ LOG.debug("Setting tick tuple interval to [" + tickTupleInterval + "] based on topology timeout");
+ }
} catch(Exception e) {
LOG.warn("unable to make connection to hive ", e);
}
[2/3] storm git commit: Merge branch 'STORM-1102' of
https://github.com/dossett/storm into STORM-1102
Posted by ka...@apache.org.
Merge branch 'STORM-1102' of https://github.com/dossett/storm into STORM-1102
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d0a9df4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d0a9df4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d0a9df4
Branch: refs/heads/master
Commit: 6d0a9df463e58a1b114d4b253b6ba9fe2b3c40d2
Parents: e954d0a 9a25aed
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 17 22:33:54 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 17 22:33:54 2015 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hive/bolt/HiveBolt.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-1102 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1102 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/379ab804
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/379ab804
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/379ab804
Branch: refs/heads/master
Commit: 379ab8043e17e4a088a277f98815143154b361ab
Parents: 6d0a9df
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 17 22:35:13 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 17 22:35:13 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/379ab804/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecea859..d5bc13f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1102: Add a default flush interval for HiveBolt
* STORM-1112: Add executor id to the thread name of the executor thread for debug
* STORM-1079: Batch Puts to HBase
* STORM-1084: Improve Storm config validation process to use java annotations instead of *_SCHEMA format