ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smn...@apache.org
Subject ambari git commit: AMBARI-17747: EU/RU Kafka should come right after ZK instead of before Atlas, fix role command order
Date Thu, 28 Jul 2016 20:20:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 176690d9c -> 3feae3d62


AMBARI-17747: EU/RU Kafka should come right after ZK instead of before Atlas, fix role command
order


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

Branch: refs/heads/trunk
Commit: 3feae3d62f7307520aa643d53972adf1ac87780c
Parents: 176690d
Author: Nahappan Somasundaram <nsomasundaram@hortonworks.com>
Authored: Wed Jul 27 16:36:42 2016 -0700
Committer: Nahappan Somasundaram <nsomasundaram@hortonworks.com>
Committed: Thu Jul 28 13:16:23 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 | 59 +++++++---------
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     | 65 +++++++++---------
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     | 30 +++++++--
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     | 27 ++++++--
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 45 +++++++------
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 71 +++++++-------------
 .../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, 268 insertions(+), 291 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3feae3d6/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 f58eb5a..e5565f6 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,10 +91,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -183,6 +179,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -365,6 +365,15 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -431,7 +440,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -532,15 +543,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -661,6 +663,14 @@
       </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>
@@ -948,14 +958,6 @@
       </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/3feae3d6/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 e4139f5..5b20a72 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,10 +68,6 @@
       <parallel-scheduler/>
       <service-check>false</service-check>
 
-      <service name="ATLAS">
-        <component>ATLAS_SERVER</component>
-      </service>
-
       <service name="FLUME">
         <component>FLUME_HANDLER</component>
       </service>
@@ -95,10 +91,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -188,6 +180,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -400,6 +396,15 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -466,7 +471,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -519,16 +526,6 @@
       </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>
@@ -577,15 +574,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -650,7 +638,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
-        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -707,6 +694,14 @@
       </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,14 +989,6 @@
       </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>
@@ -1155,14 +1142,5 @@
         </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/3feae3d6/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 7197e29..c7a9920 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,10 +77,6 @@
       <parallel-scheduler/>
       <service-check>false</service-check>
 
-      <service name="ATLAS">
-        <component>ATLAS_SERVER</component>
-      </service>
-
       <service name="FLUME">
         <component>FLUME_HANDLER</component>
       </service>
@@ -104,10 +100,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -198,6 +190,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -507,6 +503,16 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -573,7 +579,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -674,15 +682,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -747,7 +746,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
-        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -905,6 +903,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="MAPREDUCE2">
       <component name="HISTORYSERVER">
         <upgrade>
@@ -1091,14 +1097,6 @@
       </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>
@@ -1248,14 +1246,5 @@
         </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/3feae3d6/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 4f5778b..9360036 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,6 +118,13 @@
         <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>
@@ -163,6 +170,7 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>ZOOKEEPER</service>
+        <service>KAFKA</service>
         <service>HDFS</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
@@ -330,13 +338,6 @@
       </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">
@@ -444,6 +445,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="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
@@ -787,31 +813,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="STORM">
       <component name="NIMBUS">
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3feae3d6/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 a6cee94..c9f9823 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,6 +116,13 @@
       </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>
@@ -366,13 +373,6 @@
       </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">
@@ -478,6 +478,22 @@
         </upgrade>
       </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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3feae3d6/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 7a3a19e..d0332ed 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,6 +126,13 @@
       </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>
@@ -376,13 +383,6 @@
       </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">
@@ -534,6 +534,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="RANGER">
       <component name="RANGER_ADMIN">
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->

http://git-wip-us.apache.org/repos/asf/ambari/blob/3feae3d6/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 351416a..efa71a8 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,10 +91,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -184,6 +180,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -360,6 +360,15 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -426,7 +435,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -527,15 +538,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -600,7 +602,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
-        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -758,6 +759,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="MAPREDUCE2">
       <component name="HISTORYSERVER">
         <upgrade>
@@ -944,14 +953,6 @@
       </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/3feae3d6/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 902c421..d78a554 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,11 +71,6 @@
       <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>
@@ -99,10 +94,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -192,6 +183,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -478,6 +473,15 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -544,7 +548,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -597,17 +603,6 @@
       </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>
@@ -656,15 +651,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -729,7 +715,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
-        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>SLIDER</service>
@@ -887,6 +872,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="MAPREDUCE2">
       <component name="HISTORYSERVER">
         <upgrade>
@@ -1073,14 +1066,6 @@
       </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>
@@ -1230,15 +1215,5 @@
         </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/3feae3d6/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 78d22ab..1c00e71 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,7 +116,14 @@
         <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>
@@ -328,13 +335,6 @@
       </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,6 +442,14 @@
       </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>
@@ -780,14 +788,6 @@
       </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/3feae3d6/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 2168868..102f97e 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,6 +121,13 @@
       </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>
@@ -371,13 +378,6 @@
       </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">
@@ -529,6 +529,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="RANGER">
       <component name="RANGER_ADMIN">
         <pre-downgrade/> <!--  no-op to prevent config changes on downgrade -->
@@ -920,18 +932,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="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/3feae3d6/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 cc9290f..1f1716d 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
@@ -14,7 +14,8 @@
     "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"]
+    "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"]
   },
   "_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/3feae3d6/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 417c20f..42c2e23 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,10 +95,6 @@
         <component>KNOX_GATEWAY</component>
       </service>
 
-      <service name="KAFKA">
-        <component>KAFKA_BROKER</component>
-      </service>
-
       <service name="FALCON">
         <component>FALCON_SERVER</component>
       </service>
@@ -190,6 +186,10 @@
         <component>PHOENIX_QUERY_SERVER</component>
       </service>
 
+      <service name="KAFKA">
+        <component>KAFKA_BROKER</component>
+      </service>
+
       <service name="HDFS">
         <component>DATANODE</component>
         <component>NAMENODE</component>
@@ -364,6 +364,15 @@
       </execute-stage>
     </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="YARN_AND_MAPR" title="YARN and MapReduce2">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -430,7 +439,9 @@
       <skippable>true</skippable>
       <direction>UPGRADE</direction>
       <priority>
+        <service>ZOOKEEPER</service>
         <service>HDFS</service>
+        <service>KAFKA</service>
         <service>YARN</service>
         <service>MAPREDUCE2</service>
         <service>HBASE</service>
@@ -565,15 +576,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="KNOX" title="Knox">
       <service-check>false</service-check>
       <skippable>true</skippable>
@@ -629,7 +631,6 @@
       <direction>UPGRADE</direction>
       <priority>
         <service>FALCON</service>
-        <service>KAFKA</service>
         <service>KNOX</service>
         <service>STORM</service>
         <service>FLUME</service>
@@ -832,6 +833,14 @@
       </component>
     </service>
 
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <upgrade>
+          <task xsi:type="restart-task"/>
+        </upgrade>
+      </component>
+    </service>
+
     <service name="HBASE">
       <component name="HBASE_MASTER">
         <upgrade>
@@ -989,14 +998,6 @@
       </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/3feae3d6/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 d365f79..6e45b3b 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,7 +116,14 @@
         <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>
@@ -357,13 +364,6 @@
       </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,6 +464,14 @@
       </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>
@@ -817,14 +825,6 @@
       </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