This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1bd7cdb AMBARI-24042. Kafka Service Check failed on https enabled/WE
cluster after Ambari Upgrade. Error : Failed to check that topic exists
(amagyar) (#1477)
1bd7cdb is described below
commit 1bd7cdb96df0db47c9ce94732051e32fdaa9435b
Author: Attila Magyar <[email protected]>
AuthorDate: Wed Jun 6 16:15:12 2018 +0200
AMBARI-24042. Kafka Service Check failed on https enabled/WE cluster after
Ambari Upgrade. Error : Failed to check that topic exists (amagyar) (#1477)
---
.../resources/common-services/KAFKA/0.8.1/package/scripts/params.py | 2 ++
.../common-services/KAFKA/0.8.1/package/scripts/service_check.py | 3 +++
2 files changed, 5 insertions(+)
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
index 17c678a..7b2de27 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
@@ -71,6 +71,8 @@ zookeeper_connect =
default("/configurations/kafka-broker/zookeeper.connect", No
kafka_user_nofile_limit =
default('/configurations/kafka-env/kafka_user_nofile_limit', 128000)
kafka_user_nproc_limit =
default('/configurations/kafka-env/kafka_user_nproc_limit', 65536)
+kafka_delete_topic_enable =
default('/configurations/kafka-broker/delete.topic.enable', True)
+
# parameters for 2.2+
if stack_version_formatted and
check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
kafka_home = os.path.join(stack_root, "current", "kafka-broker")
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
index 86d72ad..748dbf2 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
@@ -44,6 +44,9 @@ class ServiceCheck(Script):
if topic_exists_cmd_code > 0:
raise Fail("Error encountered when attempting to list topics:
{0}".format(topic_exists_cmd_out))
+ if not params.kafka_delete_topic_enable:
+ Logger.info('Kafka delete.topic.enable is not enabled. Skipping topic
creation: %s' % topic)
+ return
# run create topic command only if the topic doesn't exists
--
To stop receiving notification emails like this one, please contact
[email protected].
