You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/05/23 14:09:08 UTC
[1/3] storm git commit: Add the option to set client.id to
storm-kafka, STORM-2524
Repository: storm
Updated Branches:
refs/heads/master 9e31509d4 -> 385fdd71f
Add the option to set client.id to storm-kafka, STORM-2524
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26bcfdbe
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26bcfdbe
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26bcfdbe
Branch: refs/heads/master
Commit: 26bcfdbef95c4aecbff8aee0a587281f59b55bcf
Parents: 9e31509
Author: Carl Haferd <ch...@groupon.com>
Authored: Mon May 22 16:09:19 2017 -0700
Committer: Carl Haferd <ch...@groupon.com>
Committed: Mon May 22 16:09:19 2017 -0700
----------------------------------------------------------------------
docs/storm-kafka.md | 9 ++++++---
.../src/jvm/org/apache/storm/kafka/SpoutConfig.java | 12 ++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/26bcfdbe/docs/storm-kafka.md
----------------------------------------------------------------------
diff --git a/docs/storm-kafka.md b/docs/storm-kafka.md
index c1162cc..20244f2 100644
--- a/docs/storm-kafka.md
+++ b/docs/storm-kafka.md
@@ -57,11 +57,14 @@ The optional ClientId is used as a part of the ZooKeeper path where the spout's
There are 2 extensions of KafkaConfig currently in use.
-Spoutconfig is an extension of KafkaConfig that supports additional fields with ZooKeeper connection info and for controlling
-behavior specific to KafkaSpout. The Zkroot will be used as root to store your consumer's offset. The id should uniquely
-identify your spout.
+SpoutConfig is an extension of KafkaConfig that supports additional fields with ZooKeeper connection info and for controlling
+behavior specific to KafkaSpout.
+The clientId will be used to identify requests which are made using the Kafka Protocol.
+The zkRoot will be used as root to store your consumer's offset.
+The id should uniquely identify your spout.
```java
+public SpoutConfig(BrokerHosts hosts, String topic, String clientId, String zkRoot, String id);
public SpoutConfig(BrokerHosts hosts, String topic, String zkRoot, String id);
```
http://git-wip-us.apache.org/repos/asf/storm/blob/26bcfdbe/external/storm-kafka/src/jvm/org/apache/storm/kafka/SpoutConfig.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/SpoutConfig.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/SpoutConfig.java
index aa93c24..2a684c2 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/SpoutConfig.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/SpoutConfig.java
@@ -42,9 +42,21 @@ public class SpoutConfig extends KafkaConfig implements Serializable {
public long retryDelayMaxMs = 60 * 1000;
public int retryLimit = -1;
+ /**
+ * Create a SpoutConfig without setting client.id, which can make the source application ambiguous when tracing Kafka calls.
+ */
public SpoutConfig(BrokerHosts hosts, String topic, String zkRoot, String id) {
super(hosts, topic);
this.zkRoot = zkRoot;
this.id = id;
}
+
+ /**
+ * Create a SpoutConfig with a client.id value.
+ */
+ public SpoutConfig(BrokerHosts hosts, String topic, String clientId, String zkRoot, String id) {
+ super(hosts, topic, clientId);
+ this.zkRoot = zkRoot;
+ this.id = id;
+ }
}
[2/3] storm git commit: Merge branch 'master' of
https://github.com/carl34/storm into STORM-2524
Posted by bo...@apache.org.
Merge branch 'master' of https://github.com/carl34/storm into STORM-2524
STORM-2524: Add the option to set client.id to storm-kafka
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8bb5f5b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8bb5f5b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8bb5f5b8
Branch: refs/heads/master
Commit: 8bb5f5b8fdf5177129b44d7cda7de455913bfa40
Parents: 9e31509 26bcfdb
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue May 23 08:50:55 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue May 23 08:50:55 2017 -0500
----------------------------------------------------------------------
docs/storm-kafka.md | 9 ++++++---
.../src/jvm/org/apache/storm/kafka/SpoutConfig.java | 12 ++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-2524 to Changelog
Posted by bo...@apache.org.
Added STORM-2524 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/385fdd71
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/385fdd71
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/385fdd71
Branch: refs/heads/master
Commit: 385fdd71fae99fc6ca55c157ab44d6313bdb840f
Parents: 8bb5f5b
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue May 23 08:51:21 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue May 23 08:51:21 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/385fdd71/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fed540..b5f62c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-2524: Add the option to set client.id to storm-kafka
* STORM-2448: Add in Storm and JDK versions when submitting a topology.
* STORM-2503: Fix lgtm.com alerts on equality and comparison operations.
* STORM-2499: Add Serialization plugin for EventHub System Properties