Repository: ambari Updated Branches: refs/heads/branch-2.6 b38901bd9 -> ab05c5fec
AMBARI-21573. Kafka service failed to start during regenerate keytab after upgrade from Biginsights 4.2.5,4.2.0 to HDP 2.6.2 (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab05c5fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab05c5fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab05c5fe Branch: refs/heads/branch-2.6 Commit: ab05c5fec861bce64234400ea6bb665dc42b7c87 Parents: b38901b Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Tue Jul 25 15:54:52 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Tue Jul 25 17:44:24 2017 -0700 ---------------------------------------------------------------------- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 14 ++++++++++++++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 10 ++++++++++ .../BigInsights/4.2/upgrades/config-upgrade.xml | 14 ++++++++++++++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 10 ++++++++++ 4 files changed, 48 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ab05c5fe/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index 87a2aef..2e9bd65 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -18,6 +18,20 @@ <upgrade-config-changes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-config.xsd"> <services> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <changes> + <!-- BigInsights used to have security.inter.broker.protocol=SASL_PLAINTEXT but the preferred value in HDP 2.6 + is PLAINTEXTSASL and set also set listeners to use the same value, only when the cluster is kerberized. --> + <definition xsi:type="configure" id="hdp_2_6_fix_kafka_protocol"> + <type>kafka-broker</type> + <set key="security.inter.broker.protocol" value="PLAINTEXTSASL"/> + <replace key="listeners" find="SASL_PLAINTEXT" replace-with="PLAINTEXTSASL"/> + </definition> + </changes> + </component> + </service> + <service name="HDFS"> <component name="NAMENODE"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/ab05c5fe/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index a7ddd5c..684acfa 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -195,6 +195,16 @@ <skippable>true</skippable> <!-- May fix configuration problems manually --> <supports-auto-skip-failure>false</supports-auto-skip-failure> + <!-- KAFKA --> + <!-- BigInsights used to have security.inter.broker.protocol=SASL_PLAINTEXT but the preferred value in HDP 2.6 + is PLAINTEXTSASL and set also set listeners to use the same value, only when the cluster is kerberized. --> + <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply Kerberos config changes for Kafka"> + <condition xsi:type="security" type="kerberos"/> + <task xsi:type="configure" id="hdp_2_6_fix_kafka_protocol"> + <summary>Apply Kerberos config changes for Kafka</summary> + </task> + </execute-stage> + <!-- HDFS --> <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hadoop NameNode"> <task xsi:type="configure" id="biginsights_4_2_namenode_update_hadoop_env" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/ab05c5fe/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index 6d00a90..f79272f 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -110,6 +110,20 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <changes> + <!-- BigInsights used to have security.inter.broker.protocol=SASL_PLAINTEXT but the preferred value in HDP 2.6 + is PLAINTEXTSASL and set also set listeners to use the same value, only when the cluster is kerberized. --> + <definition xsi:type="configure" id="hdp_2_6_fix_kafka_protocol"> + <type>kafka-broker</type> + <set key="security.inter.broker.protocol" value="PLAINTEXTSASL"/> + <replace key="listeners" find="SASL_PLAINTEXT" replace-with="PLAINTEXTSASL"/> + </definition> + </changes> + </component> + </service> + <service name="HDFS"> <component name="NAMENODE"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/ab05c5fe/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index cedc90f..484e459 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -190,6 +190,16 @@ <skippable>true</skippable> <!-- May fix configuration problems manually --> <supports-auto-skip-failure>false</supports-auto-skip-failure> + <!-- KAFKA --> + <!-- BigInsights used to have security.inter.broker.protocol=SASL_PLAINTEXT but the preferred value in HDP 2.6 + is PLAINTEXTSASL and set also set listeners to use the same value, only when the cluster is kerberized. --> + <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply Kerberos config changes for Kafka"> + <condition xsi:type="security" type="kerberos"/> + <task xsi:type="configure" id="hdp_2_6_fix_kafka_protocol"> + <summary>Apply Kerberos config changes for Kafka</summary> + </task> + </execute-stage> + <!-- HDFS --> <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hadoop NameNode"> <task xsi:type="configure" id="biginsights_4_2_namenode_update_hadoop_env" />