You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/04/01 06:59:33 UTC
[1/4] storm git commit: STORM-1669: Fix SolrUpdateBolt flush bug
Repository: storm
Updated Branches:
refs/heads/master 2a435b028 -> b74320497
STORM-1669: Fix SolrUpdateBolt flush bug
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/01062f10
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/01062f10
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/01062f10
Branch: refs/heads/master
Commit: 01062f109e9f05e93eed3c15a52a623f270cfef1
Parents: 2f1411d
Author: Xin Wang <be...@163.com>
Authored: Thu Mar 31 12:30:35 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Thu Mar 31 12:30:35 2016 +0800
----------------------------------------------------------------------
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 23 ++++++++------------
1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/01062f10/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index cab9899..ff0a96e 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -18,14 +18,12 @@
package org.apache.storm.solr.bolt;
-import org.apache.storm.Config;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.topology.base.BaseRichBolt;
import org.apache.storm.tuple.Tuple;
import org.apache.storm.utils.TupleUtils;
-import org.apache.storm.utils.Utils;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
@@ -45,6 +43,11 @@ import java.util.Map;
public class SolrUpdateBolt extends BaseRichBolt {
private static final Logger LOG = LoggerFactory.getLogger(SolrUpdateBolt.class);
+ /**
+ * Half of the default Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS
+ */
+ private static final int DEFAULT_TICK_TUPLE_INTERVAL_SECS = 15;
+
private final SolrConfig solrConfig;
private final SolrMapper solrMapper;
private final SolrCommitStrategy commitStgy; // if null, acks every tuple
@@ -52,7 +55,7 @@ public class SolrUpdateBolt extends BaseRichBolt {
private SolrClient solrClient;
private OutputCollector collector;
private List<Tuple> toCommitTuples;
- private int tickTupleInterval;
+ private int tickTupleInterval = DEFAULT_TICK_TUPLE_INTERVAL_SECS;
public SolrUpdateBolt(SolrConfig solrConfig, SolrMapper solrMapper) {
this(solrConfig, solrMapper, null);
@@ -72,17 +75,6 @@ public class SolrUpdateBolt extends BaseRichBolt {
this.collector = collector;
this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
this.toCommitTuples = new ArrayList<>(capacity());
-
- setTickTupleInterval(stormConf);
- }
-
- private void setTickTupleInterval(Map stormConf) {
- this.tickTupleInterval = solrConfig.getTickTupleInterval();
- if(stormConf.containsKey(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS) && tickTupleInterval == 0) {
- Integer topologyTimeout = Utils.getInt(stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
- tickTupleInterval = (int)(Math.floor(topologyTimeout / 2));
- LOG.debug("Setting tick tuple interval to [{}] based on topology timeout", tickTupleInterval);
- }
}
private int capacity() {
@@ -153,6 +145,9 @@ public class SolrUpdateBolt extends BaseRichBolt {
@Override
public Map<String, Object> getComponentConfiguration() {
+ if (solrConfig.getTickTupleInterval() > 0) {
+ this.tickTupleInterval = solrConfig.getTickTupleInterval();
+ }
return TupleUtils.putTickFrequencyIntoComponentConfig(super.getComponentConfiguration(), tickTupleInterval);
}
[3/4] storm git commit: add STORM-1669 to changelog
Posted by pt...@apache.org.
add STORM-1669 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a09bf00d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a09bf00d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a09bf00d
Branch: refs/heads/master
Commit: a09bf00df2e081db40946571d7877f3c762cf88d
Parents: ca4015e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 00:55:41 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 00:55:41 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a09bf00d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bb6971..a4b0d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
* STORM-1521: When using Kerberos login from keytab with multiple bolts/executors ticket is not renewed in hbase bolt.
## 1.0.0
+ * STORM-1669: Fix SolrUpdateBolt flush bug
* STORM-1573: Add batch support for MongoInsertBolt
* STORM-1660: remove flux gitignore file and move rules to top level gitignore
* STORM-1634: Refactoring of Resource Aware Scheduler
[2/4] storm git commit: Merge branch 'STORM-1669' of
github.com:vesense/storm
Posted by pt...@apache.org.
Merge branch 'STORM-1669' of github.com:vesense/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca4015ea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca4015ea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca4015ea
Branch: refs/heads/master
Commit: ca4015eadfc23bf7bf38c594c9782df22bdf3298
Parents: 33e4994 01062f1
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 00:49:37 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 00:49:37 2016 -0400
----------------------------------------------------------------------
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 23 ++++++++------------
1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[4/4] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b7432049
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b7432049
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b7432049
Branch: refs/heads/master
Commit: b74320497ba3d3465ddc1c94eda0c4a387046b59
Parents: a09bf00 2a435b0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 00:56:04 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 00:56:04 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
docs/flux.md | 6 ++--
external/flux/README.md | 6 ++--
.../java/org/apache/storm/flux/FluxBuilder.java | 29 ++++++++------------
.../src/test/resources/configs/kafka_test.yaml | 2 +-
.../src/main/resources/kafka_spout.yaml | 2 +-
6 files changed, 21 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b7432049/CHANGELOG.md
----------------------------------------------------------------------