http://git-wip-us.apache.org/repos/asf/ambari/blob/86d24d75/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 3d3bf54..b97dfcd 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"> @@ -230,8 +229,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> @@ -246,8 +245,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> @@ -270,8 +269,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> @@ -388,8 +387,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> @@ -423,8 +422,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> @@ -445,8 +444,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> @@ -557,9 +556,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> @@ -570,27 +569,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> @@ -609,14 +616,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> @@ -630,13 +639,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> @@ -684,7 +693,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> @@ -704,7 +715,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 --> @@ -825,7 +838,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/> @@ -868,31 +883,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> @@ -904,9 +925,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> @@ -914,21 +938,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> @@ -964,11 +992,12 @@ <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" /> <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" /> </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,8 +1024,9 @@ <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" /> @@ -1004,12 +1035,14 @@ <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/> - <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> @@ -1017,12 +1050,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> @@ -1035,14 +1070,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> @@ -1055,7 +1092,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> @@ -1068,7 +1106,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/86d24d75/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 e4245ec..d1e1059 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"> @@ -304,7 +308,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> @@ -361,7 +364,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> @@ -440,8 +444,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> @@ -520,8 +524,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> @@ -567,12 +571,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"> @@ -608,8 +606,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> @@ -688,14 +686,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> @@ -717,14 +717,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> @@ -936,14 +938,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/86d24d75/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 a0e6915..3964617 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,23 +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> @@ -67,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="ATLAS"> <component>ATLAS_SERVER</component> @@ -177,9 +176,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"> @@ -262,7 +261,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 --> @@ -277,7 +278,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"> @@ -286,8 +289,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> @@ -318,11 +325,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 --> @@ -357,7 +368,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 --> @@ -379,8 +392,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"> @@ -453,7 +467,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> @@ -510,7 +523,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> @@ -589,8 +603,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> @@ -669,8 +683,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> @@ -716,12 +730,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"> @@ -757,8 +765,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> @@ -837,14 +845,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> @@ -866,14 +876,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> @@ -1085,14 +1097,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> @@ -1134,24 +1148,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> @@ -1164,7 +1182,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> @@ -1175,7 +1194,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> @@ -1188,7 +1208,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> @@ -1201,7 +1222,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/86d24d75/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 d83d528..390f18e 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> @@ -439,7 +438,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> @@ -449,14 +449,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> @@ -478,14 +480,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> @@ -560,7 +564,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> @@ -626,7 +632,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" /> @@ -711,29 +719,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/86d24d75/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 201d4b6..19d25e2 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"> @@ -216,8 +214,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> @@ -232,8 +230,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> @@ -256,8 +254,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> @@ -374,8 +372,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> @@ -409,8 +407,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> @@ -431,8 +429,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> @@ -543,9 +541,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> @@ -556,27 +554,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> @@ -595,14 +601,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> @@ -616,12 +624,13 @@ <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" /> <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" /> </pre-upgrade> + <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -630,13 +639,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> @@ -684,7 +693,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> @@ -704,7 +715,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 --> @@ -735,10 +748,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" /> @@ -817,7 +831,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> </pre-upgrade> @@ -884,9 +900,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> @@ -894,21 +913,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> @@ -944,11 +967,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> @@ -960,18 +984,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> @@ -981,12 +1008,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> @@ -999,14 +1028,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> @@ -1019,7 +1050,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> @@ -1032,21 +1064,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/86d24d75/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 dfa7742..5f9ddd5 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 @@ -30,6 +30,11 @@ <reponame>HDP-UTILS</reponame> <unique>false</unique> </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/86d24d75/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 af8a8e3..5e3561a 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> <!-- STORM --> @@ -333,7 +338,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> @@ -391,7 +395,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> @@ -470,8 +475,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> @@ -593,8 +598,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> @@ -641,12 +646,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"> @@ -673,8 +672,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> @@ -752,14 +751,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> @@ -787,14 +788,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> @@ -1025,14 +1028,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/86d24d75/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 541cc99..b02cbad 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> @@ -181,8 +180,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> @@ -197,8 +196,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> @@ -221,8 +220,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> @@ -375,8 +374,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> @@ -486,7 +485,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> @@ -496,14 +496,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> @@ -531,14 +533,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> @@ -613,7 +617,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> @@ -677,7 +683,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" /> @@ -781,29 +789,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>
