Repository: incubator-atlas Updated Branches: refs/heads/master a2e7738aa -> 4f6816572
ATLAS-912 Update to use Kafka 0.10.0.0 (from 0.9.0.0) (madhan.neethiraj via yhemanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4f681657 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4f681657 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4f681657 Branch: refs/heads/master Commit: 4f6816572cbcdbe7bbd0cf84ac21f799d51acde3 Parents: a2e7738 Author: Hemanth Yamijala <[email protected]> Authored: Fri Jun 17 23:12:03 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Fri Jun 17 23:12:03 2016 +0530 ---------------------------------------------------------------------- docs/src/site/twiki/InstallationSteps.twiki | 2 +- .../src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java | 3 ++- pom.xml | 2 +- release-log.txt | 1 + .../atlas/notification/NotificationHookConsumerKafkaTest.java | 5 +++-- 5 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f681657/docs/src/site/twiki/InstallationSteps.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki index 1eac288..457ca37 100644 --- a/docs/src/site/twiki/InstallationSteps.twiki +++ b/docs/src/site/twiki/InstallationSteps.twiki @@ -7,7 +7,7 @@ git clone https://git-wip-us.apache.org/repos/asf/incubator-atlas.git atlas cd atlas -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m" && mvn clean install +export MAVEN_OPTS="-Xmx1536m -XX:MaxPermSize=512m" && mvn clean install </verbatim> Once the build successfully completes, artifacts can be packaged for deployment. http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f681657/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java b/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java index 7a1e07a..c695741 100644 --- a/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java +++ b/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java @@ -20,6 +20,7 @@ package org.apache.atlas.hook; import com.google.common.annotations.VisibleForTesting; import kafka.admin.AdminUtils; +import kafka.admin.RackAwareMode; import kafka.utils.ZkUtils; import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkConnection; @@ -114,7 +115,7 @@ public class AtlasTopicCreator { int numPartitions = atlasProperties.getInt("atlas.notification.hook.numthreads", 1); int numReplicas = atlasProperties.getInt("atlas.notification.replicas", 1); AdminUtils.createTopic(zkUtils, topicName, numPartitions, numReplicas, - new Properties()); + new Properties(), RackAwareMode.Enforced$.MODULE$); LOG.warn("Created topic {} with partitions {} and replicas {}", topicName, numPartitions, numReplicas); } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f681657/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6f75740..1539922 100755 --- a/pom.xml +++ b/pom.xml @@ -371,7 +371,7 @@ <hadoop.version>2.7.0</hadoop.version> <hbase.version>1.1.2</hbase.version> <solr.version>5.1.0</solr.version> - <kafka.version>0.9.0.0</kafka.version> + <kafka.version>0.10.0.0</kafka.version> <!-- scala versions --> <scala.version>2.10.4</scala.version> <scala.binary.version>2.10</scala.binary.version> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f681657/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 413493f..225cc8e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -3,6 +3,7 @@ Apache Atlas Release Notes --trunk - unreleased INCOMPATIBLE CHANGES: +ATLAS-912 Update to use Kafka 0.10.0.0 (from 0.9.0.0) (madhan.neethiraj via yhemanth) ATLAS-542 Make qualifiedName and name consistent across all Datasets and Process (sumasai via yhemanth) ATLAS-716 Entity update/delete notifications (shwethags) ATLAS-619 Canonicalize hive queries (sumasai) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f681657/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java index 5b2ffeb..6fd1939 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java @@ -43,7 +43,7 @@ public class NotificationHookConsumerKafkaTest { private KafkaNotification kafkaNotification; @BeforeTest - public void setup() throws AtlasException { + public void setup() throws AtlasException, InterruptedException { kafkaNotification = startKafkaServer(); } @@ -124,9 +124,10 @@ public class NotificationHookConsumerKafkaTest { return entity; } - KafkaNotification startKafkaServer() throws AtlasException { + KafkaNotification startKafkaServer() throws AtlasException, InterruptedException { KafkaNotification kafkaNotification = (KafkaNotification) notificationInterface; kafkaNotification.start(); + Thread.sleep(2000); return kafkaNotification; }
