AMBARI-18630. For rolling upgrade of Kafka 0.10.0.1, set configs for backward compatibility (ncole)

4 files changed, 28 insertions, 0 deletions

diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 7ef9235755..cdbe319dcc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -353,6 +353,11 @@
             <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file" />
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir" />
           </definition>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility">
+            <type>kafka-broker</type>
+            <set key="inter.broker.protocol.version" value="0.9.0.0" />
+            <set key="log.message.format.version" value="0.9.0.0" />
+          </definition>
         </changes>
       </component>
     </service>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 46e11e419a..8ecd90f848 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -523,6 +523,14 @@
           <message>-- If keytabs are managed manually, create the required ranger keytabs in the locations specified in ranger config and restart Ranger components.</message>
         </task>
       </execute-stage>
+      
+      <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Kafka Property Removal">
+        <task xsi:type="manual">
+          <message>Kafka Brokers have been upgraded with version compatability.</message>
+          <message>Config property "inter.broker.protocol.version" should be removed at your convenience.</message>
+          <message>Config property "log.message.format.version" should be removed when all clients have been upgraded.</message>
+        </task>
+      </execute-stage>
 
       <execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
         <task xsi:type="execute" hosts="master">
@@ -978,6 +986,7 @@
         <pre-downgrade/>
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
+          <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" />
         </pre-upgrade>
 
         <upgrade>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index dfecfc04db..9045443742 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -208,6 +208,11 @@
             <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file" />
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir" />
           </definition>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility">
+            <type>kafka-broker</type>
+            <set key="inter.broker.protocol.version" value="0.9.0.0" />
+            <set key="log.message.format.version" value="0.9.0.0" />
+          </definition>
         </changes>
       </component>
     </service>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index 8a7f0fa51c..826cf16c67 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -503,6 +503,14 @@
           <message>-- If keytabs are managed manually, create the required ranger keytabs in the locations specified in ranger config and restart Ranger components.</message>
         </task>
       </execute-stage>
+      
+      <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Kafka Property Removal">
+        <task xsi:type="manual">
+          <message>Kafka Brokers have been upgraded with version compatability.</message>
+          <message>Config property "inter.broker.protocol.version" should be removed at your convenience.</message>
+          <message>Config property "log.message.format.version" should be removed when all clients have been upgraded.</message>
+        </task>
+      </execute-stage>
 
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Hive Server Port Change">
         <task xsi:type="manual">
@@ -617,6 +625,7 @@
         <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
+          <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" />
         </pre-upgrade>
 
         <upgrade>