kafka git commit: MINOR: support retrieving cluster_id in system tests

[ewencp]

Repository: kafka
Updated Branches:
  refs/heads/0.11.0 0bf34e715 -> d0be27b4e


MINOR: support retrieving cluster_id in system tests

ewencp would be great to cherry-pick this back into 0.11.x if possible

Author: Xavier Léauté 

Reviewers: Ewen Cheslack-Postava 

Closes #3645 from xvrl/system-test-cluster-id

(cherry picked from commit b8cf976865f3559b4e5c45eeb261444cd1d7383f)
Signed-off-by: Ewen Cheslack-Postava 


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/d0be27b4
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/d0be27b4
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/d0be27b4

Branch: refs/heads/0.11.0
Commit: d0be27b4e075ec604ed4636c5e7799513a52ef74
Parents: 0bf34e7
Author: Xavier Léauté 
Authored: Tue Aug 8 19:58:47 2017 -0700
Committer: Ewen Cheslack-Postava 
Committed: Tue Aug 8 19:59:12 2017 -0700

--
 tests/kafkatest/services/kafka/kafka.py | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kafka/blob/d0be27b4/tests/kafkatest/services/kafka/kafka.py
--
diff --git a/tests/kafkatest/services/kafka/kafka.py 
b/tests/kafkatest/services/kafka/kafka.py
index b22b518..cd71e5e 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -488,6 +488,16 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, 
Service):
 self.logger.info("Leader for topic %s and partition %d is now: %d" % 
(topic, partition, leader_idx))
 return self.get_node(leader_idx)
 
+def cluster_id(self):
+""" Get the current cluster id
+"""
+self.logger.debug("Querying ZooKeeper to retrieve cluster id")
+cluster = json.loads(self.zk.query("/cluster/id"))
+if cluster is None:
+raise Exception("Error querying ZK for cluster id.")
+
+return cluster['id']
+
 def list_consumer_groups(self, node=None, new_consumer=True, 
command_config=None):
 """ Get list of consumer groups.
 """

kafka git commit: MINOR: support retrieving cluster_id in system tests

[ewencp]

Repository: kafka
Updated Branches:
  refs/heads/trunk fb8edbdc6 -> b8cf97686


MINOR: support retrieving cluster_id in system tests

ewencp would be great to cherry-pick this back into 0.11.x if possible

Author: Xavier Léauté 

Reviewers: Ewen Cheslack-Postava 

Closes #3645 from xvrl/system-test-cluster-id


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b8cf9768
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b8cf9768
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b8cf9768

Branch: refs/heads/trunk
Commit: b8cf976865f3559b4e5c45eeb261444cd1d7383f
Parents: fb8edbd
Author: Xavier Léauté 
Authored: Tue Aug 8 19:58:47 2017 -0700
Committer: Ewen Cheslack-Postava 
Committed: Tue Aug 8 19:58:47 2017 -0700

--
 tests/kafkatest/services/kafka/kafka.py | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kafka/blob/b8cf9768/tests/kafkatest/services/kafka/kafka.py
--
diff --git a/tests/kafkatest/services/kafka/kafka.py 
b/tests/kafkatest/services/kafka/kafka.py
index e941a3d..ee60bab 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -531,6 +531,16 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, 
Service):
 self.logger.info("Leader for topic %s and partition %d is now: %d" % 
(topic, partition, leader_idx))
 return self.get_node(leader_idx)
 
+def cluster_id(self):
+""" Get the current cluster id
+"""
+self.logger.debug("Querying ZooKeeper to retrieve cluster id")
+cluster = json.loads(self.zk.query("/cluster/id"))
+if cluster is None:
+raise Exception("Error querying ZK for cluster id.")
+
+return cluster['id']
+
 def list_consumer_groups(self, node=None, new_consumer=True, 
command_config=None):
 """ Get list of consumer groups.
 """