ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: Revert "AMBARI-18167: RU: Kafka brokers restart was stopped during downgrade cluster (Mugdha Varadkar via jluniya)"
Date Thu, 18 Aug 2016 13:51:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bc2d2d378 -> 813938395


Revert "AMBARI-18167: RU: Kafka brokers restart was stopped during downgrade cluster (Mugdha
Varadkar via jluniya)"

This reverts commit 43457696137486daa338f39cef5e899554f025b3.


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

Branch: refs/heads/trunk
Commit: 813938395f23ca1a70bf75b3bea3eeaa54ea1997
Parents: bc2d2d3
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Aug 18 09:32:52 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Aug 18 09:34:36 2016 -0400

----------------------------------------------------------------------
 .../resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml  | 13 ++++++++++++-
 .../resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml  |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/81393839/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 e772068..bc8e9f9 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
@@ -536,7 +536,6 @@
 
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
-        <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->
         <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" />
@@ -968,6 +967,18 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
+        </pre-upgrade>
+
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->

http://git-wip-us.apache.org/repos/asf/ambari/blob/81393839/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 f5d7b18..e886301 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
@@ -531,7 +531,6 @@
 
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
-        <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" />
         </pre-upgrade>


Mime
View raw message