You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2017/04/28 01:18:23 UTC
kafka git commit: Use zkUtils instead of zkClient in AdminUtils
Repository: kafka
Updated Branches:
refs/heads/trunk 4b9de871d -> bc10f5f17
Use zkUtils instead of zkClient in AdminUtils
Author: Balint Molnar <ba...@gmail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #2888 from baluchicken/KAFKA-5103
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/bc10f5f1
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/bc10f5f1
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/bc10f5f1
Branch: refs/heads/trunk
Commit: bc10f5f173383ae4593d4742a16060faa88d7fb6
Parents: 4b9de87
Author: Balint Molnar <ba...@gmail.com>
Authored: Fri Apr 28 02:17:16 2017 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Fri Apr 28 02:17:56 2017 +0100
----------------------------------------------------------------------
core/src/main/scala/kafka/admin/AdminUtils.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/bc10f5f1/core/src/main/scala/kafka/admin/AdminUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/admin/AdminUtils.scala b/core/src/main/scala/kafka/admin/AdminUtils.scala
index c5d7f12..ca81af3 100644
--- a/core/src/main/scala/kafka/admin/AdminUtils.scala
+++ b/core/src/main/scala/kafka/admin/AdminUtils.scala
@@ -567,7 +567,7 @@ object AdminUtils extends Logging with AdminUtilities {
// create the change notification
val seqNode = ZkUtils.ConfigChangesPath + "/" + EntityConfigChangeZnodePrefix
val content = Json.encode(getConfigChangeZnodeData(sanitizedEntityPath))
- zkUtils.zkClient.createPersistentSequential(seqNode, content)
+ zkUtils.createSequentialPersistentPath(seqNode, content)
}
def getConfigChangeZnodeData(sanitizedEntityPath: String) : Map[String, Any] = {
@@ -588,7 +588,8 @@ object AdminUtils extends Logging with AdminUtilities {
*/
def fetchEntityConfig(zkUtils: ZkUtils, rootEntityType: String, sanitizedEntityName: String): Properties = {
val entityConfigPath = getEntityConfigPath(rootEntityType, sanitizedEntityName)
- val str: String = zkUtils.zkClient.readData(entityConfigPath, true)
+ // readDataMaybeNull returns Some(null) if the path exists, but there is no data
+ val str: String = zkUtils.readDataMaybeNull(entityConfigPath)._1.orNull
val props = new Properties()
if (str != null) {
Json.parseFull(str) match {