Repository: ambari Updated Branches: refs/heads/trunk 208e75278 -> e47efc67d
AMBARI-17747. EU/RU Kafka should come right after ZK instead of before Atlas, fix role command order (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e47efc67 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e47efc67 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e47efc67 Branch: refs/heads/trunk Commit: e47efc67dad09fc7fa3b73d2ac4b84bf77771cf6 Parents: 208e752 Author: Alejandro Fernandez <[email protected]> Authored: Mon Jul 18 11:13:18 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Mon Jul 18 11:13:18 2016 -0700 ---------------------------------------------------------------------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 44 ++++++------ .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 +++++++----------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 58 +++++++--------- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 65 +++++++++--------- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 43 ++++++------ .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 40 +++++------ .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 45 ++++++------ .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 72 +++++++------------- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 32 ++++----- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 38 +++++------ .../stacks/HDP/2.5/role_command_order.json | 3 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 45 ++++++------ .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 32 ++++----- 13 files changed, 266 insertions(+), 319 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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..36de7b8 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 @@ -91,10 +91,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -201,6 +197,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -290,6 +290,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -414,6 +423,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -515,15 +526,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -661,6 +663,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -948,14 +958,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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..5752c26 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 @@ -68,10 +68,6 @@ <parallel-scheduler/> <service-check>false</service-check> - <service name="ATLAS"> - <component>ATLAS_SERVER</component> - </service> - <service name="FLUME"> <component>FLUME_HANDLER</component> </service> @@ -95,10 +91,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -206,6 +198,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -331,6 +327,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -455,6 +460,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -508,16 +515,6 @@ </service> </group> - <group xsi:type="restart" name="ATLAS" title="Atlas"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="ATLAS"> - <component>ATLAS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="OOZIE" title="Oozie"> <service-check>false</service-check> <skippable>true</skippable> @@ -566,15 +563,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -639,7 +627,6 @@ <direction>UPGRADE</direction> <priority> <service>FALCON</service> - <service>KAFKA</service> <service>KNOX</service> <service>STORM</service> <service>SLIDER</service> @@ -712,6 +699,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -999,14 +994,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> @@ -1160,14 +1147,5 @@ </upgrade> </component> </service> - - <service name="ATLAS"> - <component name="ATLAS_SERVER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - - </service> </processing> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 7be5a19..7d96155 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 @@ -77,10 +77,6 @@ <parallel-scheduler/> <service-check>false</service-check> - <service name="ATLAS"> - <component>ATLAS_SERVER</component> - </service> - <service name="FLUME"> <component>FLUME_HANDLER</component> </service> @@ -104,10 +100,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -215,6 +207,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -409,6 +405,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -533,6 +538,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -634,15 +641,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -707,7 +705,6 @@ <direction>UPGRADE</direction> <priority> <service>FALCON</service> - <service>KAFKA</service> <service>KNOX</service> <service>STORM</service> <service>SLIDER</service> @@ -780,6 +777,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -1067,14 +1072,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> @@ -1224,14 +1221,5 @@ </upgrade> </component> </service> - - <service name="ATLAS"> - <component name="ATLAS_SERVER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - - </service> </processing> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 4f5778b..9360036 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 @@ -118,6 +118,13 @@ <component>ZOOKEEPER_SERVER</component> </service> </group> + + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> <group name="RANGER" title="Ranger"> <skippable>true</skippable> @@ -163,6 +170,7 @@ <direction>UPGRADE</direction> <priority> <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -330,13 +338,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -444,6 +445,31 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <!-- 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"> + <script>scripts/kafka_broker.py</script> + <function>stop</function> + </task> + </pre-upgrade> + + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + + <service name="KNOX"> + <component name="KNOX_GATEWAY"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -787,31 +813,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <!-- 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"> - <script>scripts/kafka_broker.py</script> - <function>stop</function> - </task> - </pre-upgrade> - - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - - <service name="KNOX"> - <component name="KNOX_GATEWAY"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="STORM"> <component name="NIMBUS"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 46cda9b..b139d2e 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 @@ -116,6 +116,13 @@ </service> </group> + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="RANGER" title="Ranger"> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> @@ -365,13 +372,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -478,6 +478,21 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <pre-upgrade> + <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/> + </pre-upgrade> + + <!-- no-op to prevent config changes on downgrade --> + <pre-downgrade/> + + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -844,20 +859,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <pre-upgrade> - <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/> - </pre-upgrade> - - <pre-downgrade/> - - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 47d9fdb..09007a6 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 @@ -126,6 +126,13 @@ </service> </group> + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="RANGER" title="Ranger"> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> @@ -375,13 +382,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -524,6 +524,19 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <pre-upgrade> + <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> + </pre-upgrade> + + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> @@ -918,19 +931,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <pre-upgrade> - <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/> - <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> - </pre-upgrade> - - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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..6ac33d3 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 @@ -91,10 +91,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -202,6 +198,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -285,6 +285,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -409,6 +418,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -510,15 +521,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -583,7 +585,6 @@ <direction>UPGRADE</direction> <priority> <service>FALCON</service> - <service>KAFKA</service> <service>KNOX</service> <service>STORM</service> <service>SLIDER</service> @@ -657,6 +658,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -944,14 +953,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 2daa9b8..c82e938 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 @@ -71,11 +71,6 @@ <parallel-scheduler/> <service-check>false</service-check> - <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select. --> - <service name="ATLAS"> - <component>ATLAS_SERVER</component> - </service> - <service name="FLUME"> <component>FLUME_HANDLER</component> </service> @@ -99,10 +94,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -210,6 +201,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -368,6 +363,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -492,6 +496,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -545,17 +551,6 @@ </service> </group> - <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select. --> - <group xsi:type="restart" name="ATLAS" title="Atlas"> - <service-check>false</service-check> - <skippable>true</skippable> - <supports-auto-skip-failure>false</supports-auto-skip-failure> - <parallel-scheduler/> - <service name="ATLAS"> - <component>ATLAS_SERVER</component> - </service> - </group> - <group xsi:type="restart" name="OOZIE" title="Oozie"> <service-check>false</service-check> <skippable>true</skippable> @@ -604,15 +599,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -672,13 +658,11 @@ </service> </group> - <group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check"> <skippable>true</skippable> <direction>UPGRADE</direction> <priority> <service>FALCON</service> - <service>KAFKA</service> <service>KNOX</service> <service>STORM</service> <service>SLIDER</service> @@ -752,6 +736,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -1039,14 +1031,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> @@ -1196,15 +1180,5 @@ </upgrade> </component> </service> - - <!-- TODO, Atlas doesn't yet support upgrades and the client doesn't exist in hdp-select. --> - <service name="ATLAS"> - <component name="ATLAS_SERVER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - - </service> </processing> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 78d22ab..1c00e71 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 @@ -116,7 +116,14 @@ <component>ZOOKEEPER_SERVER</component> </service> </group> - + + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="RANGER" title="Ranger"> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> @@ -328,13 +335,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -442,6 +442,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -780,14 +788,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 dd7a87f..a9336bb 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 @@ -121,6 +121,13 @@ </service> </group> + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="RANGER" title="Ranger"> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> @@ -370,13 +377,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -519,6 +519,18 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> + </pre-upgrade> + + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> @@ -881,18 +893,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <pre-upgrade> - <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> - </pre-upgrade> - - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json index 64a77e2..40e8ff8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json @@ -13,7 +13,8 @@ "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "LOGSEARCH_SOLR-START"], "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START"], "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START","LIVY_SERVER-START"], - "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"] + "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"], + "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"] }, "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster", "optional_no_glusterfs": { http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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..03c2dd9 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 @@ -95,10 +95,6 @@ <component>KNOX_GATEWAY</component> </service> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - <service name="FALCON"> <component>FALCON_SERVER</component> </service> @@ -209,6 +205,10 @@ <component>RANGER_KMS_SERVER</component> </service> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + <service name="ZOOKEEPER"> <component>ZOOKEEPER_SERVER</component> </service> @@ -288,6 +288,15 @@ </service> </group> + <group xsi:type="restart" name="KAFKA" title="Kafka"> + <service-check>false</service-check> + <skippable>true</skippable> + <parallel-scheduler/> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group xsi:type="restart" name="RANGER" title="Ranger"> <service-check>false</service-check> <skippable>true</skippable> @@ -413,6 +422,8 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> + <service>ZOOKEEPER</service> + <service>KAFKA</service> <service>HDFS</service> <service>YARN</service> <service>MAPREDUCE2</service> @@ -548,15 +559,6 @@ </service> </group> - <group xsi:type="restart" name="KAFKA" title="Kafka"> - <service-check>false</service-check> - <skippable>true</skippable> - <parallel-scheduler/> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group xsi:type="restart" name="KNOX" title="Knox"> <service-check>false</service-check> <skippable>true</skippable> @@ -612,7 +614,6 @@ <direction>UPGRADE</direction> <priority> <service>FALCON</service> - <service>KAFKA</service> <service>KNOX</service> <service>STORM</service> <service>FLUME</service> @@ -685,6 +686,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -989,14 +998,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task"/> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 d365f79..6e45b3b 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 @@ -116,7 +116,14 @@ <component>ZOOKEEPER_SERVER</component> </service> </group> - + + <group name="KAFKA" title="Kafka"> + <skippable>true</skippable> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="RANGER" title="Ranger"> <skippable>true</skippable> <supports-auto-skip-failure>false</supports-auto-skip-failure> @@ -357,13 +364,6 @@ </exclude> </group> - <group name="KAFKA" title="Kafka"> - <skippable>true</skippable> - <service name="KAFKA"> - <component>KAFKA_BROKER</component> - </service> - </group> - <group name="KNOX" title="Knox"> <skippable>true</skippable> <service name="KNOX"> @@ -464,6 +464,14 @@ </component> </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> @@ -817,14 +825,6 @@ </component> </service> - <service name="KAFKA"> - <component name="KAFKA_BROKER"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> - </service> - <service name="KNOX"> <component name="KNOX_GATEWAY"> <upgrade>
