ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: Revert "AMBARI-17747. EU/RU Kafka should come right after ZK instead of before Atlas, fix role command order (alejandro)"
Date Thu, 21 Jul 2016 00:55:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 05aa4b79d -> ebbb63a46


Revert "AMBARI-17747. EU/RU Kafka should come right after ZK instead of before Atlas, fix
role command order (alejandro)"

This reverts commit b59662a1702ec0c93ae6839fef0a6cf4d36a3d38.

Conflicts:
	ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
	ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json


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

Branch: refs/heads/branch-2.4
Commit: ebbb63a466ecd4a9e35eed8e081594037fa2bfe6
Parents: 05aa4b7
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Wed Jul 20 17:55:47 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Wed Jul 20 17:55:47 2016 -0700

----------------------------------------------------------------------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 44 ++++++------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 +++++++++++-------
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 58 +++++++++-------
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     | 65 +++++++++---------
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     | 43 ++++++------
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     | 40 +++++------
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 45 ++++++------
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 72 +++++++++++++-------
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     | 32 ++++-----
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     | 38 +++++------
 .../stacks/HDP/2.5/role_command_order.json      |  3 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 45 ++++++------
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     | 32 ++++-----
 13 files changed, 319 insertions(+), 266 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index 36de7b8..ef81111 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -91,6 +91,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -197,10 +201,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -290,15 +290,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -423,8 +414,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -526,6 +515,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -663,14 +661,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -958,6 +948,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/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 5752c26..3e46276 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
@@ -68,6 +68,10 @@
       <parallel-scheduler/>
       <service-check>false</service-check>
 
+      <service name="ATLAS">
+        <component>ATLAS_SERVER</component>
+      </service>
+
       <service name="FLUME">
         <component>FLUME_HANDLER</component>
       </service>
@@ -91,6 +95,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -198,10 +206,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -327,15 +331,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -460,8 +455,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -515,6 +508,16 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="ATLAS" title="Atlas">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <supports-auto-skip-failure>false</supports-auto-skip-failure>
+      <parallel-scheduler/>
+      <service name="ATLAS">
+        <component>ATLAS_SERVER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="OOZIE" title="Oozie">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -563,6 +566,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -627,6 +639,7 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
+        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -699,14 +712,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -994,6 +999,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>
@@ -1147,5 +1160,14 @@
         </upgrade>
       </component>
     </service>
+
+    <service name="ATLAS">
+      <component name="ATLAS_SERVER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+
+    </service>
   </processing>
 </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/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 7d96155..7be5a19 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
@@ -77,6 +77,10 @@
       <parallel-scheduler/>
       <service-check>false</service-check>
 
+      <service name="ATLAS">
+        <component>ATLAS_SERVER</component>
+      </service>
+
       <service name="FLUME">
         <component>FLUME_HANDLER</component>
       </service>
@@ -100,6 +104,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -207,10 +215,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -405,15 +409,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -538,8 +533,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -641,6 +634,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -705,6 +707,7 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
+        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -777,14 +780,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -1072,6 +1067,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>
@@ -1221,5 +1224,14 @@
         </upgrade>
       </component>
     </service>
+
+    <service name="ATLAS">
+      <component name="ATLAS_SERVER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+
+    </service>
   </processing>
 </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 9360036..4f5778b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -118,13 +118,6 @@
         <component>ZOOKEEPER_SERVER</component>
       </service>
     </group>
-
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
     
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
@@ -170,7 +163,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -338,6 +330,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -445,31 +444,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers,
running a migration script,
-        and then starting one at a time. This is needed during both upgrade and downgrade.
-->
-        <pre-upgrade>
-          <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers">
-            <script>scripts/kafka_broker.py</script>
-            <function>stop</function>
-          </task>
-        </pre-upgrade>
-
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
-    <service name="KNOX">
-      <component name="KNOX_GATEWAY">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -813,6 +787,31 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers,
running a migration script,
+        and then starting one at a time. This is needed during both upgrade and downgrade.
-->
+        <pre-upgrade>
+          <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers">
+            <script>scripts/kafka_broker.py</script>
+            <function>stop</function>
+          </task>
+        </pre-upgrade>
+
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
+    <service name="KNOX">
+      <component name="KNOX_GATEWAY">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="STORM">
       <component name="NIMBUS">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/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 f16a9da..d779583 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
@@ -116,13 +116,6 @@
       </service>
     </group>
 
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
@@ -373,6 +366,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -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>
@@ -866,6 +851,20 @@
       </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>
+
+        <pre-downgrade/>
+
+        <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/ebbb63a4/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 964ec3f..7f277fb 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
@@ -126,13 +126,6 @@
       </service>
     </group>
 
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
@@ -383,6 +376,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -525,19 +525,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 -->
@@ -938,6 +925,19 @@
       </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="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/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
index 6ac33d3..c9326aa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
@@ -91,6 +91,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -198,10 +202,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -285,15 +285,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -418,8 +409,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -521,6 +510,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -585,6 +583,7 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
+        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -658,14 +657,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -953,6 +944,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
index c82e938..2daa9b8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
@@ -71,6 +71,11 @@
       <parallel-scheduler/>
       <service-check>false</service-check>
 
+      <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select.
-->
+      <service name="ATLAS">
+        <component>ATLAS_SERVER</component>
+      </service>
+
       <service name="FLUME">
         <component>FLUME_HANDLER</component>
       </service>
@@ -94,6 +99,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -201,10 +210,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -363,15 +368,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -496,8 +492,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -551,6 +545,17 @@
       </service>
     </group>
 
+    <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select.
-->
+    <group xsi:type="restart" name="ATLAS" title="Atlas">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <supports-auto-skip-failure>false</supports-auto-skip-failure>
+      <parallel-scheduler/>
+      <service name="ATLAS">
+        <component>ATLAS_SERVER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="OOZIE" title="Oozie">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -599,6 +604,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -658,11 +672,13 @@
       </service>
     </group>
 
+
     <group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
+        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -736,14 +752,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -1031,6 +1039,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>
@@ -1180,5 +1196,15 @@
         </upgrade>
       </component>
     </service>
+
+    <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select.
-->
+    <service name="ATLAS">
+      <component name="ATLAS_SERVER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+
+    </service>
   </processing>
 </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
index 1c00e71..78d22ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
@@ -116,14 +116,7 @@
         <component>ZOOKEEPER_SERVER</component>
       </service>
     </group>
-
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
+    
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
@@ -335,6 +328,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -442,14 +442,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -788,6 +780,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/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 839cf02..43c6265 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
@@ -121,13 +121,6 @@
       </service>
     </group>
 
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
@@ -378,6 +371,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -520,18 +520,6 @@
       </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="RANGER">
       <component name="RANGER_ADMIN">
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
@@ -916,6 +904,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/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
index 9b21ed0..34848ec 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
@@ -13,8 +13,7 @@
     "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "LOGSEARCH_SOLR-START"],
     "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START", "APP_TIMELINE_SERVER-START"],
     "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "LIVY_SERVER-START"],
-    "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"],
-    "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START",
"HBASE_REGIONSERVER-START"]
+    "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"]
   },
   "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster",
   "optional_no_glusterfs": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index 03c2dd9..8c35210 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -95,6 +95,10 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -205,10 +209,6 @@
         <component>RANGER_KMS_SERVER</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="ZOOKEEPER">
         <component>ZOOKEEPER_SERVER</component>
       </service>
@@ -288,15 +288,6 @@
       </service>
     </group>
 
-    <group xsi:type="restart" name="KAFKA" title="Kafka">
-      <service-check>false</service-check>
-      <skippable>true</skippable>
-      <parallel-scheduler/>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
     <group xsi:type="restart" name="RANGER" title="Ranger">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -422,8 +413,6 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
-        <service>ZOOKEEPER</service>
-        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -559,6 +548,15 @@
       </service>
     </group>
 
+    <group xsi:type="restart" name="KAFKA" title="Kafka">
+      <service-check>false</service-check>
+      <skippable>true</skippable>
+      <parallel-scheduler/>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group xsi:type="restart" name="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -614,6 +612,7 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
+        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>FLUME</service>
@@ -686,14 +685,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task"/>
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -998,6 +989,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebbb63a4/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
index 6e45b3b..d365f79 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
@@ -116,14 +116,7 @@
         <component>ZOOKEEPER_SERVER</component>
       </service>
     </group>
-
-    <group name="KAFKA" title="Kafka">
-      <skippable>true</skippable>
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-    </group>
-
+    
     <group name="RANGER" title="Ranger">
       <skippable>true</skippable>
       <supports-auto-skip-failure>false</supports-auto-skip-failure>
@@ -364,6 +357,13 @@
       </exclude>
     </group>
 
+    <group name="KAFKA" title="Kafka">
+      <skippable>true</skippable>
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+    </group>
+
     <group name="KNOX" title="Knox">
       <skippable>true</skippable>
       <service name="KNOX">
@@ -464,14 +464,6 @@
       </component>
     </service>
 
-    <service name="KAFKA">
-      <component name="KAFKA_BROKER">
-        <upgrade>
-          <task xsi:type="restart-task" />
-        </upgrade>
-      </component>
-    </service>
-
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -825,6 +817,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
+    </service>
+
     <service name="KNOX">
       <component name="KNOX_GATEWAY">
         <upgrade>


Mime
View raw message