You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/08/10 13:17:51 UTC
ambari git commit: AMBARI-18088 - Ranger service check does not run
during Express Upgrade (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk d29b5b292 -> 37e1f5ab2
AMBARI-18088 - Ranger service check does not run during Express Upgrade (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37e1f5ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37e1f5ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37e1f5ab
Branch: refs/heads/trunk
Commit: 37e1f5ab2e75c034d9f8b6ff1906f5842b142231
Parents: d29b5b2
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Aug 9 15:39:39 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Aug 10 09:17:42 2016 -0400
----------------------------------------------------------------------
.../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 1 +
.../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 8 ++--
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 2 +
.../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 44 +++-----------------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 10 +++--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 2 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 2 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 2 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 2 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 2 +
10 files changed, 30 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
index eb5d419..94c5c46 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
@@ -478,6 +478,7 @@
<skippable>true</skippable>
<direction>UPGRADE</direction>
<priority>
+ <service>ZOOKEEPER</service>
<service>HDFS</service>
<service>YARN</service>
<service>MAPREDUCE2</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
index 286f85b..d0bfec2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
@@ -377,10 +377,12 @@
<skippable>true</skippable>
<direction>UPGRADE</direction>
<priority>
- <service>HBASE</service>
- <service>MAPREDUCE2</service>
- <service>YARN</service>
+ <service>ZOOKEEPER</service>
+ <service>RANGER</service>
<service>HDFS</service>
+ <service>YARN</service>
+ <service>MAPREDUCE2</service>
+ <service>HBASE</service>
</priority>
</group>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 a8ecc46..f512f5a 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
@@ -657,6 +657,8 @@
<skippable>true</skippable>
<direction>UPGRADE</direction>
<priority>
+ <service>ZOOKEEPER</service>
+ <service>RANGER</service>
<service>HDFS</service>
<service>YARN</service>
<service>MAPREDUCE2</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 98601c9..baf0e4b 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
@@ -85,7 +85,7 @@
<service name="FLUME">
<component>FLUME_HANDLER</component>
</service>
-
+
<service name="ACCUMULO">
<component>ACCUMULO_TRACER</component>
<component>ACCUMULO_GC</component>
@@ -175,12 +175,6 @@
<message>Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}.</message>
</task>
</execute-stage>
-
- <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Backup Ranger KMS Database">
- <task xsi:type="manual">
- <message>Before continuing, please backup Ranger KMS database on the following host(s): {{hosts.all}}.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
@@ -209,10 +203,6 @@
<component>RANGER_ADMIN</component>
</service>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
-
<service name="ZOOKEEPER">
<component>ZOOKEEPER_SERVER</component>
</service>
@@ -242,12 +232,6 @@
<message>Before continuing, please restore the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}.</message>
</task>
</execute-stage>
-
- <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Restore Ranger KMS Database">
- <task xsi:type="manual">
- <message>Before continuing, please restore Ranger KMS database</message>
- </task>
- </execute-stage>
</group>
<!--
@@ -597,16 +581,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -710,6 +684,8 @@
<skippable>true</skippable>
<direction>UPGRADE</direction>
<priority>
+ <service>ZOOKEEPER</service>
+ <service>RANGER</service>
<service>HDFS</service>
<service>YARN</service>
<service>MAPREDUCE2</service>
@@ -874,7 +850,7 @@
<component>FLUME_HANDLER</component>
</service>
</group>
-
+
<group xsi:type="restart" name="ACCUMULO" title="Accumulo">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -905,7 +881,7 @@
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
<direction>UPGRADE</direction>
-
+
<execute-stage title="Check Component Versions">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.ComponentVersionCheckAction" />
</execute-stage>
@@ -986,14 +962,6 @@
</component>
</service>
- <service name="RANGER_KMS">
- <component name="RANGER_KMS_SERVER">
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1287,7 +1255,7 @@
<function>delete_storm_local_data</function>
</task>
</pre-downgrade>
-
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 e5565f6..11c7042 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
@@ -71,7 +71,7 @@
<service name="FLUME">
<component>FLUME_HANDLER</component>
</service>
-
+
<service name="ACCUMULO">
<component>ACCUMULO_TRACER</component>
<component>ACCUMULO_GC</component>
@@ -293,7 +293,7 @@
</task>
</execute-stage>
</group>
-
+
<!-- Now, restart all of the services. -->
<group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper">
<service-check>false</service-check>
@@ -441,6 +441,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>
@@ -587,7 +589,7 @@
<component>FLUME_HANDLER</component>
</service>
</group>
-
+
<group xsi:type="restart" name="ACCUMULO" title="Accumulo">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -617,7 +619,7 @@
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
<direction>UPGRADE</direction>
-
+
<execute-stage title="Check Component Versions">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.ComponentVersionCheckAction" />
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 dbdecc7..21ce135 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
@@ -484,6 +484,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 384b4aa..5a9f43e 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
@@ -600,6 +600,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 efa71a8..f3f9aa8 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
@@ -436,6 +436,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 0733f03..d2d5c54 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
@@ -557,6 +557,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e1f5ab/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 0044f11..2642521 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
@@ -455,6 +455,8 @@
<direction>UPGRADE</direction>
<priority>
<service>ZOOKEEPER</service>
+ <service>RANGER</service>
+ <service>RANGER_KMS</service>
<service>HDFS</service>
<service>KAFKA</service>
<service>YARN</service>