You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/08/27 11:43:56 UTC
[2/4] ambari git commit: AMBARI-18232. Upgrade Execute: add xsd for
upgrade packs (ncole)
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 09bd2ac..27f2010 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
@@ -16,14 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
-
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -50,9 +48,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<!-- Instructs the upgrade pack how to build the configuration pack -->
<upgrade-path>
<intermediate-stack version="2.4"/>
@@ -154,7 +149,9 @@
<skippable>true</skippable>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Update HBase Configuration">
- <task xsi:type="server_action" summary="Update HBase Env Configuration" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction">
+ <summary>Update HBase Env Configuration</summary>
+ </task>
</execute-stage>
</group>
@@ -167,15 +164,17 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
</group>
<!-- This needs to be done for every Rolling Upgrade pack that changes configurations. -->
<group xsi:type="cluster" name="CONFIGURE_CLIENT_DEPENDENCIES" title="Write client configs">
+ <direction>UPGRADE</direction>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Write Mapreduce2 Client configs">
<task xsi:type="execute">
@@ -220,8 +219,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -236,8 +235,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -260,8 +259,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -378,8 +377,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -413,8 +412,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -435,8 +434,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>DOWNGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -545,9 +544,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -558,27 +557,35 @@
<task xsi:type="configure" id="hdp_2_5_0_0_remove_sso_property" />
<task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
<task xsi:type="execute" hosts="all">
<script>scripts/ranger_admin.py</script>
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -597,14 +604,16 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db" />
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -618,13 +627,13 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
-
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -672,7 +681,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -692,7 +703,9 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
@@ -819,7 +832,9 @@
<!-- Remove Atlas configs that were incorrectly added to hive-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_hive_atlas_configs" />
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
@@ -869,31 +884,37 @@
<service name="SPARK">
<component name="SPARK_JOBHISTORYSERVER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
</component>
<component name="SPARK_THRIFTSERVER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_thriftserver"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="SPARK_CLIENT">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_remove_spark_properties_extraJavaOptions"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -905,9 +926,12 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -915,21 +939,25 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
- <task xsi:type="server_action" summary="Fixing Oozie admin users"
- class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fixing Oozie admin users</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -965,10 +993,11 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
- <pre-downgrade/>
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade/>
<upgrade>
<task xsi:type="restart-task" />
@@ -978,10 +1007,11 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task" />
@@ -994,20 +1024,23 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
<!-- Remove Atlas configs that were incorrectly added to storm-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs" />
<task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1015,12 +1048,14 @@
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1033,14 +1068,16 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1053,7 +1090,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1066,7 +1104,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 750f934..9622031 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
@@ -16,9 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.4.*.*</target>
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd"> <target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
<type>NON_ROLLING</type>
<prerequisite-checks>
@@ -63,10 +61,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -169,9 +167,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -254,12 +252,16 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez">
@@ -268,7 +270,9 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus">
@@ -300,7 +304,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -357,7 +360,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -436,8 +440,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -516,8 +520,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -563,12 +567,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -604,8 +602,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -673,14 +671,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -702,14 +702,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -921,14 +923,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 6f9372e..4df5fef 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
@@ -16,22 +16,22 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
<type>NON_ROLLING</type>
<prerequisite-checks>
<check>org.apache.ambari.server.checks.RangerAuditDbCheck</check>
+ <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
+
<configuration>
<!-- Configuration properties for all pre-reqs including required pre-reqs -->
<check-properties name="org.apache.ambari.server.checks.HiveDynamicServiceDiscoveryCheck">
<property name="min-failure-stack-version">HDP-2.3.0.0</property>
</check-properties>
</configuration>
-
- <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
</prerequisite-checks>
+
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -66,10 +66,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -172,9 +172,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -257,7 +257,9 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!-- YARN -->
@@ -272,7 +274,9 @@
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez">
@@ -281,8 +285,12 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
- <task xsi:type="server_action" summary="Fix oozie admin users" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fix oozie admin users</summary>
+ </task>
</execute-stage>
@@ -313,11 +321,15 @@
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties">
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Configuring Ranger Alerts">
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
</execute-stage>
<!-- HDFS -->
@@ -352,7 +364,9 @@
</execute-stage>
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server">
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
</execute-stage>
<!-- HBASE -->
@@ -374,8 +388,9 @@
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus in KerberosDescriptor">
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
@@ -425,7 +440,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -482,7 +496,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -561,8 +576,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -641,8 +656,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>OOZIE</service>
@@ -688,12 +703,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -729,8 +738,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -798,14 +807,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -827,14 +838,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -1046,14 +1059,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1095,24 +1110,28 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1125,7 +1144,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1136,7 +1156,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1149,7 +1170,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1162,7 +1184,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 abf2db3..17d7d9c 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
@@ -16,13 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -164,8 +163,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -180,8 +179,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -204,8 +203,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -321,8 +320,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -445,7 +444,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -455,14 +455,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -484,14 +486,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -566,7 +570,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -632,7 +638,9 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_tez_client_adjust_tez_lib_uris_property"/>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task" />
@@ -735,29 +743,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 f20ad06..b8c51f5 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
@@ -16,14 +16,13 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
-
+ <type>ROLLING</type>
+
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -50,9 +49,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -153,15 +149,17 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
</group>
<!-- This needs to be done for every Rolling Upgrade pack that changes configurations. -->
<group xsi:type="cluster" name="CONFIGURE_CLIENT_DEPENDENCIES" title="Write client configs">
+ <direction>UPGRADE</direction>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Write Mapreduce2 Client configs">
<task xsi:type="execute">
@@ -206,8 +204,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -222,8 +220,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -246,8 +244,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -364,8 +362,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -399,8 +397,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -421,8 +419,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>DOWNGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -531,9 +529,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -544,27 +542,35 @@
<task xsi:type="configure" id="hdp_2_5_0_0_remove_sso_property" />
<task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
<task xsi:type="execute" hosts="all">
<script>scripts/ranger_admin.py</script>
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -583,14 +589,16 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db" />
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -604,11 +612,12 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -617,13 +626,13 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
-
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -671,7 +680,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -691,7 +702,9 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
@@ -722,10 +735,11 @@
<service name="HBASE">
<component name="HBASE_MASTER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task" />
@@ -804,7 +818,9 @@
<component name="HIVE_SERVER">
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" />
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
<task xsi:type="manual">
<summary>HiveServer Port Availability</summary>
@@ -878,9 +894,12 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -888,21 +907,25 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
- <task xsi:type="server_action" summary="Fixing Oozie admin users"
- class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fixing Oozie admin users</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -938,11 +961,12 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -954,18 +978,21 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
<!-- Remove Atlas configs that were incorrectly added to storm-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs" />
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -974,12 +1001,14 @@
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -992,14 +1021,16 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1012,7 +1043,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1025,21 +1057,23 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+
<post-upgrade>
<task xsi:type="manual">
<message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
</task>
</post-upgrade>
- <upgrade>
- <task xsi:type="restart-task" />
- </upgrade>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
index ad8cfd4..0e83e65 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
@@ -28,6 +28,11 @@
<repoid>HDP-UTILS-1.1.0.21</repoid>
<reponame>HDP-UTILS</reponame>
</repo>
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos6/2.x/BUILDS/2.4.0.0-1139</baseurl>
+ <repoid>AMBARI-FOO</repoid>
+ <reponame>AMBARI-FOO</reponame>
+ </repo>
</os>
<os family="redhat7">
<repo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 cbab386..0b6f762 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
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
<type>NON_ROLLING</type>
@@ -63,10 +62,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="ATLAS">
<component>ATLAS_SERVER</component>
@@ -185,9 +184,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -276,17 +275,23 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
@@ -318,7 +323,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -376,7 +380,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -455,8 +460,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -578,8 +583,8 @@
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -626,12 +631,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="FLUME" title="Flume">
@@ -658,8 +657,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -726,14 +725,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -761,14 +762,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -999,14 +1002,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 60e81c0..49e9d87 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
@@ -16,13 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -171,8 +170,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -187,8 +186,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -211,8 +210,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -365,8 +364,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -482,7 +481,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -492,14 +492,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -527,14 +529,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -609,7 +613,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -673,7 +679,9 @@
<service name="TEZ">
<component name="TEZ_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task" />
@@ -795,29 +803,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>