[ambari] branch trunk updated: Fixing 2.7.0 as a part of code was missing from 2.6.0 causing Kafka to go down after restart post Ambari Upgrade causing java.lang.IllegalArgumentException

[rlevas]

This is an automated email from the ASF dual-hosted git repository.

rlevas 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 f7904ec  Fixing 2.7.0 as a part of code was missing from 2.6.0 causing 
Kafka to go down after restart post Ambari Upgrade causing 
java.lang.IllegalArgumentException
f7904ec is described below

commit f7904ec65c4d57cf8db2f090a1d2e8e6b5546504
Author: Sapin amin <sa...@hortonworks.com>
AuthorDate: Fri May 4 17:59:16 2018 -0700

    Fixing 2.7.0 as a part of code was missing from 2.6.0 causing Kafka to go 
down after restart post Ambari Upgrade causing 
java.lang.IllegalArgumentException
---
 .../KAFKA/0.8.1/package/scripts/kafka.py              | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
index 949f3a2..f03bccb 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
@@ -51,12 +51,21 @@ def kafka(upgrade_type=None):
 
        listeners = kafka_server_config['listeners'].replace("localhost", 
params.hostname)
        Logger.info(format("Kafka listeners: {listeners}"))
-       kafka_server_config['listeners'] = listeners       
 
-       if 'advertised.listeners' in kafka_server_config:
-         advertised_listeners = 
kafka_server_config['advertised.listeners'].replace("localhost", 
params.hostname)
-         kafka_server_config['advertised.listeners'] = advertised_listeners
-         Logger.info(format("Kafka advertised listeners: 
{advertised_listeners}"))
+       if params.kerberos_security_enabled and params.kafka_kerberos_enabled:
+         Logger.info("Kafka kerberos security is enabled.")
+         if "SASL" not in listeners:
+           listeners = listeners.replace("PLAINTEXT", "PLAINTEXTSASL")
+
+         kafka_server_config['listeners'] = listeners
+         kafka_server_config['advertised.listeners'] = listeners
+         Logger.info(format("Kafka advertised listeners: {listeners}"))
+       else:
+         kafka_server_config['listeners'] = listeners
+         if 'advertised.listeners' in kafka_server_config:
+           advertised_listeners = 
kafka_server_config['advertised.listeners'].replace("localhost", 
params.hostname)
+           kafka_server_config['advertised.listeners'] = advertised_listeners
+           Logger.info(format("Kafka advertised listeners: 
{advertised_listeners}"))
     else:
       kafka_server_config['host.name'] = params.hostname
 

-- 
To stop receiving notification emails like this one, please contact
rle...@apache.org.