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/02/18 14:33:47 UTC
[28/33] ambari git commit: AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or
2.4 to remove deprecated kafka-broker port property (alejandro)
AMBARI-15033. RU/EU from HDP 2.2 to 2.3 or 2.4 to remove deprecated kafka-broker port property (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b53a13fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b53a13fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b53a13fe
Branch: refs/heads/branch-dev-patch-upgrade
Commit: b53a13fe6a96eb8e620f0ee86643c8b96ed19c77
Parents: 8999aee
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Feb 17 15:30:56 2016 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Feb 17 16:24:02 2016 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 3 +--
.../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 3 +--
.../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 ++
.../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 2 ++
.../HDP/2.3/services/KAFKA/configuration/kafka-broker.xml | 2 +-
.../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +++--
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 3 +--
.../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 4 ++++
.../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +++--
9 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
index 84da86c..5c6c456 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
@@ -526,9 +526,8 @@
</execute-stage>
<!-- KAFKA -->
-
<execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka">
- <task xsi:type="configure" id ="hdp_2_3_0_0_kafka_broker_listeners"/>
+ <task xsi:type="configure" id ="hdp_2_3_0_0_kafka_broker_deprecate_port"/>
</execute-stage>
</group>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
index c0eae48..eca1789 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
@@ -564,9 +564,8 @@
</execute-stage>
<!-- KAFKA -->
-
<execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka">
- <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_listeners"/>
+ <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
</execute-stage>
</group>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 353dc86..61540b7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -811,6 +811,8 @@
<script>scripts/kafka_broker.py</script>
<function>stop</function>
</task>
+
+ <task xsi:type="configure" id="hdp_2_3_0_0_kafka_broker_deprecate_port"/>
</pre-upgrade>
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
index cfd2904..5c91764 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
@@ -824,6 +824,8 @@
<script>scripts/kafka_broker.py</script>
<function>stop</function>
</task>
+
+ <task xsi:type="configure" id="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
</pre-upgrade>
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
index 6e924e2..8802f13 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
@@ -23,7 +23,7 @@
<name>listeners</name>
<value>PLAINTEXT://localhost:6667</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <description>host and port where kafka broker will be accepting connnections. localhost will be subsituted with hostname.</description>
+ <description>host and port where kafka broker will be accepting connections. localhost will be substituted with hostname.</description>
</property>
<property>
<name>controlled.shutdown.enable</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/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 b8963bc..2f042b1 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
@@ -893,9 +893,10 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
<changes>
- <definition xsi:type="configure" id="hdp_2_3_0_0_kafka_broker_listeners">
+ <definition xsi:type="configure" id="hdp_2_3_0_0_kafka_broker_deprecate_port">
<type>kafka-broker</type>
- <set key="listeners" value="PLAINTEXT://localhost:6667"/>
+ <!-- Deprecate "port" property since "listeners" will be added. -->
+ <transfer operation="delete" delete-key="port"/>
</definition>
</changes>
</component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index 4e148d5..67bc0e7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -316,9 +316,8 @@
</execute-stage>
<!-- KAFKA -->
- <!--TODO: remove? Used for non-rolling upgrade only-->
<execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka">
- <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_listeners"/>
+ <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
</execute-stage>
</group>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index 59f9389..42148b0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -740,6 +740,10 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
+ <pre-upgrade>
+ <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
+ </pre-upgrade>
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b53a13fe/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 ee06577..1cc2668 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
@@ -157,9 +157,10 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
<changes>
- <definition xsi:type="configure" id="hdp_2_4_0_0_kafka_broker_listeners">
+ <definition xsi:type="configure" id="hdp_2_4_0_0_kafka_broker_deprecate_port">
<type>kafka-broker</type>
- <set key="listeners" value="PLAINTEXT://localhost:6667"/>
+ <!-- Deprecate "port" property since "listeners" will be added. -->
+ <transfer operation="delete" delete-key="port"/>
</definition>
</changes>
</component>