You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/10/19 13:56:42 UTC
ambari git commit: AMBARI-18630. For rolling upgrade of Kafka
0.10.0.1, set configs for backward compatibility (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 c3306a632 -> 67d415dfa
AMBARI-18630. For rolling upgrade of Kafka 0.10.0.1, set configs for backward compatibility (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67d415df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67d415df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67d415df
Branch: refs/heads/branch-2.4
Commit: 67d415dfacc52ae2e6b129dd9a881ad12387904c
Parents: c3306a6
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Oct 19 09:56:28 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Oct 19 09:56:28 2016 -0400
----------------------------------------------------------------------
.../resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +++++
.../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 9 +++++++++
.../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +++++
.../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 9 +++++++++
4 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/67d415df/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
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 7ef9235..cdbe319 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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/67d415df/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
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 46e11e4..8ecd90f 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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/67d415df/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
----------------------------------------------------------------------
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 dfecfc0..9045443 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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/67d415df/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
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 8a7f0fa..826cf16 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>