You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/12/17 20:51:44 UTC
[1/2] bigtop git commit: BIGTOP-2638: Update to kafka 0.10.1.0
Repository: bigtop
Updated Branches:
refs/heads/master 939d6bea8 -> 1b34df0e8
BIGTOP-2638: Update to kafka 0.10.1.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/83677c15
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/83677c15
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/83677c15
Branch: refs/heads/master
Commit: 83677c156dd89ff3ce9a314bf00c9ca55413e440
Parents: 939d6be
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Dec 17 21:27:35 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Dec 17 21:27:35 2016 +0100
----------------------------------------------------------------------
bigtop.bom | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/83677c15/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index 16d8cea..2d8125f 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -385,7 +385,7 @@ bigtop {
'kafka' {
name = 'kafka'
relNotes = 'Apache Kafka'
- version { base = '0.10.0.0'; pkg = base; release = 1 }
+ version { base = '0.10.1.0'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "$name-${version.base}-src.tgz" }
url { download_path = "/$name/${version.base}/"
[2/2] bigtop git commit: BIGTOP-2637: Fix flume because of kafka 0.10
update
Posted by of...@apache.org.
BIGTOP-2637: Fix flume because of kafka 0.10 update
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1b34df0e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1b34df0e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1b34df0e
Branch: refs/heads/master
Commit: 1b34df0e87f347c01e0f2e56b0a835aff314e31a
Parents: 83677c1
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Dec 17 20:23:23 2016 +0000
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sat Dec 17 21:51:25 2016 +0100
----------------------------------------------------------------------
.../src/common/flume/patch1-FLUME-3026.diff | 92 ++++++++++++++++++++
1 file changed, 92 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b34df0e/bigtop-packages/src/common/flume/patch1-FLUME-3026.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/patch1-FLUME-3026.diff b/bigtop-packages/src/common/flume/patch1-FLUME-3026.diff
new file mode 100644
index 0000000..503de9d
--- /dev/null
+++ b/bigtop-packages/src/common/flume/patch1-FLUME-3026.diff
@@ -0,0 +1,92 @@
+diff --git a/flume-ng-channels/flume-kafka-channel/src/test/java/org/apache/flume/channel/kafka/TestKafkaChannel.java b/flume-ng-channels/flume-kafka-channel/src/test/java/org/apache/flume/channel/kafka/TestKafkaChannel.java
+index 5e5f2d0..917cee2 100644
+--- a/flume-ng-channels/flume-kafka-channel/src/test/java/org/apache/flume/channel/kafka/TestKafkaChannel.java
++++ b/flume-ng-channels/flume-kafka-channel/src/test/java/org/apache/flume/channel/kafka/TestKafkaChannel.java
+@@ -20,6 +20,7 @@ package org.apache.flume.channel.kafka;
+
+ import com.google.common.collect.Lists;
+ import kafka.admin.AdminUtils;
++import kafka.admin.RackAwareMode;
+ import kafka.utils.ZKGroupTopicDirs;
+ import kafka.utils.ZkUtils;
+ import org.apache.commons.lang.RandomStringUtils;
+@@ -883,7 +884,8 @@ public class TestKafkaChannel {
+ ZkUtils.apply(testUtil.getZkUrl(), sessionTimeoutMs, connectionTimeoutMs, false);
+ int replicationFactor = 1;
+ Properties topicConfig = new Properties();
+- AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig);
++ AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig,
++ RackAwareMode.Disabled$.MODULE$);
+ }
+
+ public static void deleteTopic(String topicName) {
+diff --git a/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/TestKafkaSink.java b/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/TestKafkaSink.java
+index 7c66420..bc2a299 100644
+--- a/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/TestKafkaSink.java
++++ b/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/TestKafkaSink.java
+@@ -21,6 +21,7 @@ package org.apache.flume.sink.kafka;
+ import com.google.common.base.Charsets;
+
+ import kafka.admin.AdminUtils;
++import kafka.admin.RackAwareMode;
+ import kafka.message.MessageAndMetadata;
+ import kafka.utils.ZkUtils;
+
+@@ -551,7 +552,8 @@ public class TestKafkaSink {
+ ZkUtils.apply(testUtil.getZkUrl(), sessionTimeoutMs, connectionTimeoutMs, false);
+ int replicationFactor = 1;
+ Properties topicConfig = new Properties();
+- AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig);
++ AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig,
++ RackAwareMode.Disabled$.MODULE$);
+ }
+
+ public static void deleteTopic(String topicName) {
+diff --git a/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/KafkaSourceEmbeddedKafka.java b/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/KafkaSourceEmbeddedKafka.java
+index 53bd65c..ae5348c 100644
+--- a/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/KafkaSourceEmbeddedKafka.java
++++ b/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/KafkaSourceEmbeddedKafka.java
+@@ -17,6 +17,7 @@
+ package org.apache.flume.source.kafka;
+
+ import kafka.admin.AdminUtils;
++import kafka.admin.RackAwareMode;
+ import kafka.server.KafkaConfig;
+ import kafka.server.KafkaServerStartable;
+ import kafka.utils.ZkUtils;
+@@ -131,7 +132,8 @@ public class KafkaSourceEmbeddedKafka {
+ ZkUtils zkUtils = ZkUtils.apply(zkClient, false);
+ int replicationFactor = 1;
+ Properties topicConfig = new Properties();
+- AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig);
++ AdminUtils.createTopic(zkUtils, topicName, numPartitions, replicationFactor, topicConfig,
++ RackAwareMode.Disabled$.MODULE$);
+ }
+
+ }
+diff --git a/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/TestKafkaSource.java b/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/TestKafkaSource.java
+index d1daceb..cda91f9 100644
+--- a/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/TestKafkaSource.java
++++ b/flume-ng-sources/flume-kafka-source/src/test/java/org/apache/flume/source/kafka/TestKafkaSource.java
+@@ -20,7 +20,7 @@ package org.apache.flume.source.kafka;
+ import com.google.common.base.Charsets;
+ import com.google.common.collect.Lists;
+ import junit.framework.Assert;
+-import kafka.common.TopicExistsException;
++import org.apache.kafka.common.errors.TopicExistsException;
+ import kafka.utils.ZKGroupTopicDirs;
+ import kafka.utils.ZkUtils;
+ import org.apache.avro.io.BinaryEncoder;
+diff --git a/pom.xml b/pom.xml
+index f62c99a..fb2340f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -52,7 +52,7 @@ limitations under the License.
+ <elasticsearch.version>0.90.1</elasticsearch.version>
+ <hadoop2.version>2.4.0</hadoop2.version>
+ <thrift.version>0.7.0</thrift.version>
+- <kafka.version>0.9.0.1</kafka.version>
++ <kafka.version>0.10.1.0</kafka.version>
+ <kite.version>1.0.0</kite.version>
+ <hive.version>1.0.0</hive.version>
+ <xalan.verion>2.7.1</xalan.verion>