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/01/13 18:22:29 UTC
[03/11] storm git commit: move tickTupleInterval setting to SolrConfig
move tickTupleInterval setting to SolrConfig
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f659ef0e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f659ef0e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f659ef0e
Branch: refs/heads/1.x-branch
Commit: f659ef0e8f7f582d685dca3dabebf73c9f97546c
Parents: cea4436
Author: Xin Wang <be...@163.com>
Authored: Fri Jan 8 12:27:59 2016 +0800
Committer: vesense <be...@163.com>
Committed: Fri Jan 8 12:32:38 2016 +0800
----------------------------------------------------------------------
.../apache/storm/solr/bolt/SolrUpdateBolt.java | 20 +++++---------------
.../apache/storm/solr/config/SolrConfig.java | 10 ++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f659ef0e/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 adb2b92..0c20d6c 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
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -74,8 +73,9 @@ public class SolrUpdateBolt extends BaseRichBolt {
this.collector = collector;
this.solrClient = new CloudSolrClient(solrConfig.getZkHostString());
this.toCommitTuples = new ArrayList<>(capacity());
+ this.tickTupleInterval = solrConfig.getTickTupleInterval();
- //set default tickTupleInterval if interval is zero
+ //set default tickTupleInterval
if (stormConf.containsKey("topology.message.timeout.secs") && tickTupleInterval == 0) {
Integer topologyTimeout = Utils.getInt(stormConf.get(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS));
tickTupleInterval = (int)(Math.floor(topologyTimeout / 2));
@@ -108,17 +108,12 @@ public class SolrUpdateBolt extends BaseRichBolt {
if (commitStgy == null) {
collector.ack(tuple);
} else {
- boolean forceCommit = false;
- if (TupleUtils.isTick(tuple)) {
- LOG.debug("TICK! forcing solr client commit");
- collector.ack(tuple);
- forceCommit = true;
- } else {
+ final boolean isTickTuple = TupleUtils.isTick(tuple);
+ if (!isTickTuple) {
toCommitTuples.add(tuple);
commitStgy.update();
}
-
- if (forceCommit || commitStgy.commit()) {
+ if (isTickTuple || commitStgy.commit()) {
solrClient.commit(solrMapper.getCollection());
ackCommittedTuples();
}
@@ -155,11 +150,6 @@ public class SolrUpdateBolt extends BaseRichBolt {
return queuedTuples;
}
- public SolrUpdateBolt withTickIntervalSecs(int tickTupleInterval) {
- this.tickTupleInterval = tickTupleInterval;
- return this;
- }
-
@Override
public Map<String, Object> getComponentConfiguration() {
Map<String, Object> conf = super.getComponentConfiguration();
http://git-wip-us.apache.org/repos/asf/storm/blob/f659ef0e/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
index 009430c..f895912 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
*/
public class SolrConfig implements Serializable {
private String zkHostString;
+ private int tickTupleInterval;
/**
* @param zkHostString Zookeeper host string as defined in the {@link CloudSolrClient} constructor
@@ -39,4 +40,13 @@ public class SolrConfig implements Serializable {
public String getZkHostString() {
return zkHostString;
}
+
+ public int getTickTupleInterval() {
+ return tickTupleInterval;
+ }
+
+ public void setTickTupleInterval(int tickTupleInterval) {
+ this.tickTupleInterval = tickTupleInterval;
+ }
+
}