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 2015/10/03 15:29:36 UTC
[1/3] storm git commit: STORM-1082 fix nits for properties in kafka
tests
Repository: storm
Updated Branches:
refs/heads/master 7365771fc -> 86ea8b218
STORM-1082 fix nits for properties in kafka tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f2a35a38
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f2a35a38
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f2a35a38
Branch: refs/heads/master
Commit: f2a35a38929035f5cf352d8e6bf72afe40b69358
Parents: ce93d5f
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Oct 1 14:33:10 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Oct 1 14:33:10 2015 -0500
----------------------------------------------------------------------
.../storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java | 3 +--
.../src/test/storm/kafka/bolt/KafkaBoltTest.java | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f2a35a38/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java b/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
index 0e4f351..e25d904 100644
--- a/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
@@ -195,8 +195,7 @@ public class KafkaUtilsTest {
private void createTopicAndSendMessage(String key, String value) {
Properties p = new Properties();
- p.put("request.required.acks", "1");
- p.put("serializer.class", "kafka.serializer.StringEncoder");
+ p.put("acks", "1");
p.put("bootstrap.servers", broker.getBrokerConnectionString());
p.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
p.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
http://git-wip-us.apache.org/repos/asf/storm/blob/f2a35a38/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
index 53d7c50..8e35a27 100644
--- a/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/bolt/KafkaBoltTest.java
@@ -185,8 +185,7 @@ public class KafkaBoltTest {
private KafkaBolt generateStringSerializerBolt() {
KafkaBolt bolt = new KafkaBolt();
Properties props = new Properties();
- props.put("request.required.acks", "1");
- props.put("serializer.class", "kafka.serializer.StringEncoder");
+ props.put("acks", "1");
props.put("bootstrap.servers", broker.getBrokerConnectionString());
props.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
@@ -200,8 +199,7 @@ public class KafkaBoltTest {
private KafkaBolt generateDefaultSerializerBolt(boolean async, boolean fireAndForget) {
KafkaBolt bolt = new KafkaBolt();
Properties props = new Properties();
- props.put("request.required.acks", "1");
- props.put("serializer.class", "kafka.serializer.StringEncoder");
+ props.put("acks", "1");
props.put("bootstrap.servers", broker.getBrokerConnectionString());
props.put("key.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
props.put("value.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
@@ -216,8 +214,7 @@ public class KafkaBoltTest {
private KafkaBolt defaultSerializerBoltWithSpecifiedProperties(boolean async, boolean fireAndForget) {
Properties props = new Properties();
- props.put("request.required.acks", "1");
- props.put("serializer.class", "kafka.serializer.StringEncoder");
+ props.put("acks", "1");
props.put("bootstrap.servers", broker.getBrokerConnectionString());
props.put("key.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
props.put("value.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
[3/3] storm git commit: Added STORM-1082 to Changelog
Posted by bo...@apache.org.
Added STORM-1082 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/86ea8b21
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/86ea8b21
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/86ea8b21
Branch: refs/heads/master
Commit: 86ea8b2186934ba18ce140cb5326483f7cfd9082
Parents: 7df4e9c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Oct 3 08:28:41 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Sat Oct 3 08:28:41 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/86ea8b21/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ee9b08..d9892eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1082: fix nits for properties in kafka tests
* STORM-993: include uptimeSeconds as JSON integer field
* STORM-1053: Update storm-kafka README for new producer API confs.
* STORM-1058: create CLI kill_workers to kill workers on a supervisor node
[2/3] storm git commit: Merge branch '1082' of
https://github.com/zhuoliu/storm into STORM-1082
Posted by bo...@apache.org.
Merge branch '1082' of https://github.com/zhuoliu/storm into STORM-1082
STORM-1082: fix nits for properties in kafka tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7df4e9ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7df4e9ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7df4e9ce
Branch: refs/heads/master
Commit: 7df4e9cecc06a10f70ee3d2b9ef518fed38902ff
Parents: 7365771 f2a35a3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Oct 3 08:28:17 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Sat Oct 3 08:28:17 2015 -0500
----------------------------------------------------------------------
.../storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java | 3 +--
.../src/test/storm/kafka/bolt/KafkaBoltTest.java | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------