ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-16027. Kafka upgrade from HDP 2.2 to HDP 2.3 is breaking - UT fixes (Sriharsha Chintalapani via smohanty)
Date Tue, 26 Jul 2016 19:49:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 39085e705 -> 0e673eb41


AMBARI-16027. Kafka upgrade from HDP 2.2 to HDP 2.3 is breaking - UT fixes (Sriharsha Chintalapani
via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e673eb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e673eb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e673eb4

Branch: refs/heads/branch-2.4
Commit: 0e673eb41203fd3c5364a0f264c52820e07a8641
Parents: 39085e7
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Jul 26 12:38:32 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Jul 26 12:38:32 2016 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml        | 5 -----
 .../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml        | 5 -----
 .../main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml    | 3 ---
 .../main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml    | 3 ---
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 -------
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml        | 5 -----
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml        | 5 -----
 .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml    | 4 ----
 .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml    | 1 -
 9 files changed, 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 e8acc95..6e7e272 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
@@ -514,11 +514,6 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_remove_deprecated_ranger_properties"/>
       </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_deprecate_port"/>
-      </execute-stage>
-
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 5f28489..b368db3 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
@@ -551,11 +551,6 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_remove_deprecated_ranger_properties"/>
       </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_deprecate_port"/>
-      </execute-stage>
-
     </group>
 
     <!--

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 da2d891..9eb4a44 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
@@ -850,9 +850,6 @@
         <upgrade>
           <task xsi:type="restart-task"/>
         </upgrade>
-        <post-upgrade>
-          <task xsi:type="configure" id="hdp_2_3_0_0_kafka_broker_deprecate_port"/>
-        </post-upgrade>
       </component>
     </service>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 bda0995..e67b82c 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
@@ -863,9 +863,6 @@
         <upgrade>
           <task xsi:type="restart-task"/>
         </upgrade>
-        <post-upgrade>
-          <task xsi:type="configure" id="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
-        </post-upgrade>
       </component>
     </service>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 0cfe091..c49e18e 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
@@ -389,12 +389,6 @@
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
         <changes>
-          <definition xsi:type="configure" id="hdp_2_4_0_0_kafka_broker_deprecate_port">
-            <type>kafka-broker</type>
-            <!-- Deprecate "port" property since "listeners" will be added. -->
-            <transfer operation="delete" delete-key="port"/>
-          </definition>
-
           <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db">
             <type>ranger-kafka-audit</type>
             <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
@@ -405,7 +399,6 @@
             <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
           </definition>
-
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 cfa6e08..e4139f5 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
@@ -304,11 +304,6 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
       </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_deprecate_port"/>
-      </execute-stage>
-
       <!-- SPARK -->
       <execute-stage service="SPARK" component="SPARK_JOBHISTORYSERVER" title="Apply config
changes for Spark JobHistoryServer">
         <task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index 1ff5f6a..133db26 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
@@ -354,11 +354,6 @@
         <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/>
       </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_deprecate_port"/>
-      </execute-stage>
-
       <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes
for Kafka Broker">
         <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/>
       </execute-stage>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 d779583..8de7747 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
@@ -853,10 +853,6 @@
 
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
-        <post-upgrade>
-          <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
-        </post-upgrade>
-
         <pre-downgrade/>
 
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e673eb4/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 78afb46..ff5d4d9 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
@@ -945,7 +945,6 @@
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
         <pre-upgrade>
-          <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
         </pre-upgrade>
 


Mime
View raw message