You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/03/25 06:10:14 UTC
[1/2] storm git commit: Merge branch 'STORM-1654' of
http://github.com/HeartSavioR/storm into STORM-1654
Repository: storm
Updated Branches:
refs/heads/1.x-branch a0ecb7bc5 -> 3ab224a14
Merge branch 'STORM-1654' of http://github.com/HeartSavioR/storm into STORM-1654
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/be96b250
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/be96b250
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/be96b250
Branch: refs/heads/1.x-branch
Commit: be96b250802de1f3b96da4ce382996c7dd055af5
Parents: a0ecb7b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 24 21:52:54 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 24 22:02:55 2016 -0700
----------------------------------------------------------------------
.../storm/hbase/bolt/AbstractHBaseBolt.java | 1 -
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 18 +++---------------
2 files changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/be96b250/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
index 3546f75..3bba0e7 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/AbstractHBaseBolt.java
@@ -43,7 +43,6 @@ public abstract class AbstractHBaseBolt extends BaseRichBolt {
protected HBaseMapper mapper;
protected String configKey;
protected int batchSize = 15000;
- protected int flushIntervalSecs = 0;
public AbstractHBaseBolt(String tableName, HBaseMapper mapper) {
Validate.notEmpty(tableName, "Table name can not be blank or null");
http://git-wip-us.apache.org/repos/asf/storm/blob/be96b250/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
index 2a48f10..e30a4f6 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java
@@ -20,7 +20,6 @@ package org.apache.storm.hbase.bolt;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.tuple.Tuple;
import org.apache.storm.utils.TupleUtils;
-import org.apache.storm.Config;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.storm.hbase.bolt.mapper.HBaseMapper;
@@ -40,10 +39,12 @@ import java.util.LinkedList;
*/
public class HBaseBolt extends AbstractHBaseBolt {
private static final Logger LOG = LoggerFactory.getLogger(HBaseBolt.class);
+ private static final int DEFAULT_FLUSH_INTERVAL_SECS = 1;
boolean writeToWAL = true;
List<Mutation> batchMutations;
List<Tuple> tupleBatch;
+ int flushIntervalSecs = DEFAULT_FLUSH_INTERVAL_SECS;
public HBaseBolt(String tableName, HBaseMapper mapper) {
super(tableName, mapper);
@@ -73,20 +74,7 @@ public class HBaseBolt extends AbstractHBaseBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
- Map<String, Object> conf = super.getComponentConfiguration();
- if (conf == null) {
- conf = new Config();
- }
-
- if (conf.containsKey("topology.message.timeout.secs") && flushIntervalSecs == 0) {
- Integer topologyTimeout = Integer.parseInt(conf.get("topology.message.timeout.secs").toString());
- flushIntervalSecs = (int)(Math.floor(topologyTimeout / 2));
- LOG.debug("Setting flush interval to [{}] based on topology.message.timeout.secs", flushIntervalSecs);
- }
-
- LOG.info("Enabling tick tuple with interval [{}]", flushIntervalSecs);
- conf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, flushIntervalSecs);
- return conf;
+ return TupleUtils.putTickFrequencyIntoComponentConfig(super.getComponentConfiguration(), flushIntervalSecs);
}
[2/2] storm git commit: Added STORM-1654 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1654 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ab224a1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ab224a1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ab224a1
Branch: refs/heads/1.x-branch
Commit: 3ab224a14061d74f6c3918467b7a38c02882a286
Parents: be96b25
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 24 22:03:56 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 24 22:03:56 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3ab224a1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa4e00..51c2c9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1654: HBaseBolt creates tick tuples with no interval when we don't set flushIntervalSecs
* STORM-1625: Move storm-sql dependencies out of lib folder
* STORM-1622: Rename classes with older third party shaded packages
* STORM-1537: Upgrade to kryo 3