ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [16/55] [abbrv] ambari git commit: AMBARI-18167: RU: Kafka brokers restart was stopped during downgrade cluster (Mugdha Varadkar via jonathanhurley)
Date Mon, 22 Aug 2016 13:37:11 GMT
AMBARI-18167: RU: Kafka brokers restart was stopped during downgrade cluster (Mugdha Varadkar
via jonathanhurley)


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

Branch: refs/heads/branch-dev-logsearch
Commit: fda22e2e626e655674d55a8f1e91c70bbdb7a8ae
Parents: 712a12b
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Aug 18 14:11:44 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Aug 18 14:11:50 2016 -0400

----------------------------------------------------------------------
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml        | 17 -----------------
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml        | 14 +-------------
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml        |  1 +
 3 files changed, 2 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fda22e2e/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 9690efc..0611301 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
@@ -479,21 +479,6 @@
       </component>
     </service>
 
-    <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>
-
-        <!--  no-op to prevent config changes on downgrade -->
-        <pre-downgrade/>
-
-        <upgrade>
-          <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -875,8 +860,6 @@
 
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
-        <pre-downgrade/>
-
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fda22e2e/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 bc8e9f9..839e544 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
@@ -534,19 +534,6 @@
       </component>
     </service>
 
-    <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>
-
-        <upgrade>
-          <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
@@ -969,6 +956,7 @@
 
     <service name="KAFKA">
       <component name="KAFKA_BROKER">
+        <pre-downgrade/>
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
         </pre-upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fda22e2e/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 e886301..f5d7b18 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,6 +531,7 @@
 
     <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