Repository: ambari Updated Branches: refs/heads/trunk 28d24abb1 -> 6b5387363
AMBARI-17840. Oozie service check failed after EU downgrade (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b538736 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b538736 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b538736 Branch: refs/heads/trunk Commit: 6b5387363ec9b2c7403d244fd65cf58a1e9b38ce Parents: 28d24ab Author: Nate Cole <[email protected]> Authored: Fri Jul 22 12:18:26 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Jul 22 15:27:11 2016 -0400 ---------------------------------------------------------------------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 34 ++++++++--------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 32 ++++++++-------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 32 ++++++++-------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 34 ++++++++--------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 32 ++++++++-------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 32 ++++++++-------- .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 34 ++++++++--------- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 40 ++++++++++---------- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 34 ++++++++--------- 9 files changed, 152 insertions(+), 152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml index bae1349..286f85b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml @@ -239,6 +239,23 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <scope>COMPLETE</scope> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -527,23 +544,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <scope>COMPLETE</scope> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml index 3cf47d8..e8acc95 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -521,6 +521,22 @@ </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -824,22 +840,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml index cb0badb..5f28489 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml @@ -558,6 +558,22 @@ </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>true</service-check> @@ -888,22 +904,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 ef81111..f58eb5a 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 @@ -277,6 +277,23 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <scope>COMPLETE</scope> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -596,23 +613,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <scope>COMPLETE</scope> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 3e46276..cfa6e08 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 @@ -318,6 +318,22 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -648,22 +664,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 a61b599..a1b93e3 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 @@ -397,6 +397,22 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -717,22 +733,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 c9326aa..351416a 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 @@ -272,6 +272,23 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <scope>COMPLETE</scope> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -592,23 +609,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <scope>COMPLETE</scope> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 749dda8..86e0964 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 @@ -361,6 +361,24 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <scope>COMPLETE</scope> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -504,7 +522,7 @@ <service>HBASE</service> </priority> </group> - + <group xsi:type="restart" name="HIVE_MASTERS" title="Hive Masters"> <service-check>false</service-check> <skippable>true</skippable> @@ -590,7 +608,7 @@ <service>SPARK</service> </priority> </group> - + <group xsi:type="restart" name="FALCON" title="Falcon"> <service-check>false</service-check> <skippable>true</skippable> @@ -678,7 +696,6 @@ </service> </group> - <group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check"> <skippable>true</skippable> <direction>UPGRADE</direction> @@ -693,23 +710,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <scope>COMPLETE</scope> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b538736/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 8c35210..417c20f 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 @@ -275,6 +275,23 @@ </execute-stage> </group> + <!-- + Invoke "hdp-select set all" to change any components we may have missed + that are installed on the hosts but not known by Ambari. + --> + <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> + <scope>COMPLETE</scope> + <skippable>true</skippable> + <supports-auto-skip-failure>false</supports-auto-skip-failure> + + <execute-stage title="Update stack to {{version}}"> + <task xsi:type="execute"> + <script>scripts/ru_set_all.py</script> + <function>actionexecute</function> + </task> + </execute-stage> + </group> + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -620,23 +637,6 @@ </priority> </group> - <!-- - Invoke "hdp-select set all" to change any components we may have missed - that are installed on the hosts but not known by Ambari. - --> - <group xsi:type="cluster" name="ALL_HOST_OPS" title="Set Version On All Hosts"> - <scope>COMPLETE</scope> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - - <execute-stage title="Update stack to {{version}}"> - <task xsi:type="execute"> - <script>scripts/ru_set_all.py</script> - <function>actionexecute</function> - </task> - </execute-stage> - </group> - <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction>
