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 2015/11/02 23:19:14 UTC
[07/17] storm git commit: upstream merge
upstream merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b69c6439
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b69c6439
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b69c6439
Branch: refs/heads/master
Commit: b69c643936970aa993a21c42dc0c9e498316f24b
Parents: b537700 9906f85
Author: Sumit Chawla <su...@gmail.com>
Authored: Thu Jul 9 21:01:29 2015 -0700
Committer: Sumit Chawla <su...@gmail.com>
Committed: Thu Jul 9 21:01:29 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 9 ++++++++-
external/storm-kafka/README.md | 11 +++++++++++
.../src/jvm/storm/kafka/PartitionManager.java | 1 +
log4j2/cluster.xml | 12 ++++++------
log4j2/worker.xml | 12 ++++++------
5 files changed, 32 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b69c6439/external/storm-kafka/README.md
----------------------------------------------------------------------
diff --cc external/storm-kafka/README.md
index 1e9cc12,1e9cc12..be1a4fb
--- a/external/storm-kafka/README.md
+++ b/external/storm-kafka/README.md
@@@ -219,6 -219,6 +219,17 @@@ You can provide all the produce propert
section "Important configuration properties for the producer", in your storm topology config by setting the properties
map with key kafka.broker.properties.
++###Using wildcard kafka topic match
++You can do a wildcard topic match by adding the following config
++```
++ Config config = new Config();
++ config.put("kafka.topic.wildcard.match",true);
++
++```
++
++After this you can specifiy a wildcard topic for matching e.g. clickstream.*.log. This will match all streams matching clickstream.my.log, clickstream.cart.log etc
++
++
###Putting it all together
For the bolt :
http://git-wip-us.apache.org/repos/asf/storm/blob/b69c6439/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --cc external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index 10e8569,a7ed879..c7ad4d4
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@@ -270,7 -269,8 +270,8 @@@ public class PartitionManager
}
public void close() {
+ commit();
- _connections.unregister(_partition.host, _partition.partition);
+ _connections.unregister(_partition.host, _partition.topic , _partition.partition);
}
static class KafkaMessageId {