http://git-wip-us.apache.org/repos/asf/ambari/blob/86d24d75/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml index 907e7d1..324bb70 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml @@ -15,9 +15,12 @@ See the License for the specific language governing permissions and 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> + <skip-failures>false</skip-failures> + <skip-service-check-failures>false</skip-service-check-failures> <type>ROLLING</type> <prerequisite-checks> @@ -49,9 +52,6 @@ <intermediate-stack version="2.3"/> </upgrade-path> - <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> @@ -169,8 +169,8 @@ </group> <group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check"> - <skippable>true</skippable> <direction>UPGRADE</direction> + <skippable>true</skippable> <priority> <service>ZOOKEEPER</service> <service>HDFS</service> @@ -185,8 +185,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> </service> @@ -207,8 +207,8 @@ </group> <group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check"> - <skippable>true</skippable> <direction>UPGRADE</direction> + <skippable>true</skippable> <priority> <service>ZOOKEEPER</service> <service>HDFS</service> @@ -320,8 +320,8 @@ </group> <group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check"> - <skippable>true</skippable> <direction>UPGRADE</direction> + <skippable>true</skippable> <priority> <service>ZOOKEEPER</service> <service>HDFS</service> @@ -443,9 +443,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> @@ -454,7 +454,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_env"/> <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin"/> - <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation"/> + <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation"> + <summary>Calculating Ranger Properties</summary> + </task> <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync"/> @@ -475,19 +477,23 @@ <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> @@ -503,24 +509,18 @@ <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_3_0_0_namenode_ha_adjustments"/> - <task xsi:type="configure" id="hdp_2_3_0_0_modify_hadoop_env"/> - <task xsi:type="configure" id="hdp_2_3_0_0_hdfs_adjust_ranger_plugin"/> - <task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_policy"/> - <task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_audit"/> - <task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_security"/> - <task xsi:type="configure" id="hdp_2_3_0_0_hdfs_ranger_hdfs_delete_old_properties"/> </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -553,11 +553,12 @@ <service name="MAPREDUCE2"> <component name="HISTORYSERVER"> - <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <pre-upgrade> <task xsi:type="configure" id="hdp_2_3_0_0_mapreduce2_adjust_history_server"/> </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -565,7 +566,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> @@ -576,12 +579,13 @@ <service name="YARN"> <component name="APP_TIMELINE_SERVER"> - <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <pre-upgrade> <task xsi:type="configure" id="hdp_2_3_0_0_yarn_ats_enable_recovery"/> <task xsi:type="configure" id="hdp_2_3_0_0_yarn_keep_ats_v1"/> </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -597,11 +601,13 @@ <task xsi:type="configure" id="hdp_2_3_0_0_yarn_rm_check_cs_root_max_capacity"/> - <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> </pre-upgrade> - + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> - + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -622,7 +628,6 @@ <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_3_0_0_hbase_master_adjust_phoenix_scheduler_factory"/> @@ -630,7 +635,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_set_global_memstore_size"/> - <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation"/> + <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation"> + <summary>Calculating HBase Properties</summary> + </task> <task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_adjust_phoenix_indexed_wal_edit_codec"/> @@ -648,6 +655,8 @@ <task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/> </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -678,9 +687,11 @@ <task xsi:type="configure" id="hdp_2_3_0_0_tez_keep_ats_v1"/> - <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"/> </upgrade> @@ -782,9 +793,12 @@ <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/> <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> @@ -792,19 +806,22 @@ <!-- 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> @@ -840,7 +857,8 @@ <!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers, running a migration script, and then starting one at a time. This is needed during both upgrade and downgrade. --> <pre-upgrade> - <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers"> + <task xsi:type="execute" hosts="all"> + <summary>Shut down all Kafka Brokers</summary> <script>scripts/kafka_broker.py</script> <function>stop</function> </task> @@ -853,7 +871,6 @@ <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_3_0_0_knox_configure_ranger_policy"/> @@ -861,6 +878,9 @@ <task xsi:type="configure" id="hdp_2_3_0_0_knox_remove_deprecated_ranger_properties"/> </pre-upgrade> + + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -869,29 +889,20 @@ <service name="STORM"> <component name="NIMBUS"> - <pre-downgrade> - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> - <script>scripts/storm_upgrade.py</script> - <function>delete_storm_zookeeper_data</function> - </task> - - <task xsi:type="execute" summary="Removing local Storm data"> - <script>scripts/storm_upgrade.py</script> - <function>delete_storm_local_data</function> - </task> - </pre-downgrade> <pre-upgrade> <task xsi:type="manual"> <message>Before continuing, please deactivate and kill any currently running topologies.</message> </task> - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> + <task xsi:type="execute"> + <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> @@ -914,6 +925,21 @@ <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/> </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute"> + <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</summary> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> @@ -921,7 +947,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> @@ -932,7 +959,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> @@ -945,7 +973,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> @@ -958,7 +987,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.3/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml index 97cb116..01e0601 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml @@ -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.3.*.*</target> <target-stack>HDP-2.3</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="FLUME"> <component>FLUME_HANDLER</component> @@ -168,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"> @@ -253,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> <!-- HBASE --> @@ -273,7 +276,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"> @@ -310,7 +315,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> @@ -367,7 +371,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> @@ -446,8 +451,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> @@ -526,8 +531,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> @@ -573,12 +578,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"> @@ -614,8 +613,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> @@ -702,14 +701,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> @@ -731,14 +732,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> @@ -942,14 +945,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.3/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index 6c4d3b5c..2925b64 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -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.4.*.*</target> <target-stack>HDP-2.4</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="FLUME"> <component>FLUME_HANDLER</component> @@ -169,8 +168,8 @@ </group> <group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services"> - <skippable>true</skippable> <service-check>false</service-check> + <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> <parallel-scheduler/> @@ -260,11 +259,15 @@ <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> - <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> </execute-stage> <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> <!-- HBASE --> @@ -274,7 +277,9 @@ </execute-stage> <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> <!-- TEZ --> @@ -283,7 +288,9 @@ </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> <!-- HIVE --> @@ -297,7 +304,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="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> @@ -357,7 +366,6 @@ <supports-auto-skip-failure>false</supports-auto-skip-failure> <parallel-scheduler/> <service name="ZOOKEEPER"> - <service-check>false</service-check> <component>ZOOKEEPER_SERVER</component> <component>ZOOKEEPER_CLIENT</component> </service> @@ -414,7 +422,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> @@ -493,8 +502,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> @@ -573,8 +582,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> @@ -620,12 +629,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"> @@ -661,8 +664,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> @@ -751,14 +754,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> @@ -780,14 +785,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> @@ -991,14 +998,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> @@ -1040,12 +1049,14 @@ <service name="STORM"> <component name="NIMBUS"> <pre-upgrade> - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> + <task xsi:type="execute"> + <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> @@ -1056,12 +1067,14 @@ <message>Before continuing, please deactivate and kill any currently running topologies.</message> </task> - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> + <task xsi:type="execute"> + <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> @@ -1074,7 +1087,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> @@ -1085,7 +1099,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> @@ -1098,7 +1113,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> @@ -1111,7 +1127,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.3/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml index e26de50..162f898 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml @@ -16,21 +16,19 @@ 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> <!-- Instructs the upgrade pack how to build the configuration pack --> @@ -72,10 +70,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> @@ -139,7 +137,9 @@ <task xsi:type="manual"> <message>Before continuing, please backup the Oozie Server database referenced by the Oozie server located on {{hosts.all}}.</message> </task> - <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.FixOozieAdminUsers"> + <summary>Fix oozie admin users</summary> + </task> </execute-stage> <execute-stage service="HIVE" component="HIVE_METASTORE" title="Backup Hive Metastore"> @@ -179,8 +179,8 @@ </group> <group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services"> - <skippable>true</skippable> <service-check>false</service-check> + <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> <parallel-scheduler/> @@ -274,7 +274,9 @@ <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> - <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> </execute-stage> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Yarn Resourcemanager"> @@ -286,7 +288,9 @@ </execute-stage> <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> <!-- HBASE --> @@ -300,7 +304,9 @@ </execute-stage> <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> <!-- TEZ --> @@ -309,7 +315,9 @@ </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> <!-- SQOOP --> @@ -343,12 +351,16 @@ </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> <!--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="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> @@ -406,11 +418,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> <!-- RANGER KMS --> @@ -432,8 +448,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"> @@ -485,7 +502,6 @@ <supports-auto-skip-failure>false</supports-auto-skip-failure> <parallel-scheduler/> <service name="ZOOKEEPER"> - <service-check>false</service-check> <component>ZOOKEEPER_SERVER</component> <component>ZOOKEEPER_CLIENT</component> </service> @@ -542,7 +558,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> @@ -622,8 +639,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> @@ -702,8 +719,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> @@ -749,12 +766,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"> @@ -790,8 +801,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> @@ -870,14 +881,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> @@ -899,14 +912,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> @@ -1118,14 +1133,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> @@ -1167,24 +1184,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> @@ -1197,7 +1218,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> @@ -1208,7 +1230,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> @@ -1221,7 +1244,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> @@ -1234,7 +1258,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.3/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index a3c5d39..8b00893 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -16,12 +16,11 @@ 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.3.*.*</target> + <target-stack>HDP-2.3</target-stack> <skip-failures>false</skip-failures> <skip-service-check-failures>false</skip-service-check-failures> - <target-stack>HDP-2.3</target-stack> <type>ROLLING</type> <prerequisite-checks> <!-- List of additional pre-req checks to run in addition to the required pre-reqs --> @@ -166,8 +165,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>KAFKA</service> @@ -183,8 +182,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> @@ -207,8 +206,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> @@ -324,8 +323,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> @@ -444,7 +443,8 @@ <!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers, running a migration script, and then starting one at a time. This is needed during both upgrade and downgrade. --> <pre-upgrade> - <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers"> + <task xsi:type="execute" hosts="all"> + <summary>Shut down all Kafka Brokers</summary> <script>scripts/kafka_broker.py</script> <function>stop</function> </task> @@ -467,7 +467,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> @@ -477,14 +478,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> @@ -506,14 +509,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> @@ -580,7 +585,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> @@ -651,7 +658,9 @@ <pre-upgrade> <task xsi:type="configure" id="hdp_2_3_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"/> @@ -736,29 +745,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.3/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 2265da1..a7fa6ca 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -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 --> @@ -45,9 +44,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> @@ -137,7 +133,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> @@ -157,15 +155,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"> @@ -210,8 +210,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> @@ -226,8 +226,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> @@ -250,8 +250,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> @@ -275,9 +275,9 @@ </group> <group name="SPARK" title="Spark"> + <service-check>false</service-check> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> - <service-check>false</service-check> <service name="SPARK"> <component>SPARK_JOBHISTORYSERVER</component> <component>SPARK_THRIFTSERVER</component> @@ -292,9 +292,9 @@ </group> <group name="OOZIE" title="Oozie"> + <service-check>false</service-check> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> - <service-check>false</service-check> <service name="OOZIE"> <component>OOZIE_SERVER</component> </service> @@ -308,9 +308,9 @@ </group> <group name="FALCON" title="Falcon"> + <service-check>false</service-check> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> - <service-check>false</service-check> <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -368,8 +368,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> @@ -485,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> @@ -495,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> @@ -524,14 +527,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> @@ -545,11 +550,12 @@ <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"/> </pre-upgrade> + + <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> <upgrade> <task xsi:type="restart-task" /> @@ -598,7 +604,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> @@ -618,7 +626,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> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -759,31 +769,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> @@ -795,9 +811,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> @@ -805,19 +824,22 @@ <!-- 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>
