Repository: ambari Updated Branches: refs/heads/trunk 7c1142b32 -> 46fb0471c
AMBARI-9025 - Upgrade pack for Kafka (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46fb0471 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46fb0471 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46fb0471 Branch: refs/heads/trunk Commit: 46fb0471c70ef52722a7c76a13faeb498cc3a1f2 Parents: 7c1142b Author: tbeerbower <[email protected]> Authored: Wed Jan 7 14:36:52 2015 -0500 Committer: tbeerbower <[email protected]> Committed: Wed Jan 7 14:37:05 2015 -0500 ---------------------------------------------------------------------- .../0.8.1.2.2/package/scripts/kafka_broker.py | 10 +++++-- .../KAFKA/0.8.1.2.2/package/scripts/params.py | 2 ++ .../KAFKA/0.8.1.2.2/package/scripts/upgrade.py | 29 ++++++++++++++++++++ .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 19 +++++++++++-- 4 files changed, 56 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/46fb0471/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py index c79ebb9..5a47ece 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py @@ -19,6 +19,7 @@ limitations under the License. from resource_management import * import sys +import upgrade from kafka import kafka @@ -32,7 +33,12 @@ class KafkaBroker(Script): env.set_params(params) kafka() - def start(self, env): + def pre_rolling_restart(self, env): + import params + env.set_params(params) + upgrade.prestart(env, "kafka-broker") + + def start(self, env, rolling_restart=False): import params env.set_params(params) self.configure(env) @@ -43,7 +49,7 @@ class KafkaBroker(Script): not_if=no_op_test ) - def stop(self, env): + def stop(self, env, rolling_restart=False): import params env.set_params(params) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/46fb0471/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py index 2b0e14a..7348918 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py @@ -25,6 +25,8 @@ import status_params # server configurations config = Script.get_config() +version = default("/commandParams/version", None) + stack_version_unformatted = str(config['hostLevelParams']['stack_version']) hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) http://git-wip-us.apache.org/repos/asf/ambari/blob/46fb0471/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py new file mode 100644 index 0000000..c031fa6 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py @@ -0,0 +1,29 @@ + +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" +from resource_management import * +from resource_management.core.resources.system import Execute +from resource_management.libraries.functions.version import compare_versions, format_hdp_stack_version + +def prestart(env, hdp_component): + import params + + if params.version and compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') >= 0: + Execute("hdp-select set {0} {1}".format(hdp_component, params.version)) http://git-wip-us.apache.org/repos/asf/ambari/blob/46fb0471/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml index b9d338b..73563cb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml @@ -57,7 +57,7 @@ <component>HBASE_REGIONSERVER</component> </service> - <service name="YARN"> + <service name="YARN"> <component>NODEMANAGER</component> </service> @@ -84,6 +84,12 @@ </service> </group> + <group name="KAFKA" title="Kafka"> + <service name="KAFKA"> + <component>KAFKA_BROKER</component> + </service> + </group> + <group name="CLIENTS" title="Client Components"> <service name="HDFS"> <component>HDFS_CLIENT</component> @@ -270,7 +276,7 @@ </upgrade> </component> </service> - + <service name="TEZ"> <component name="TEZ_CLIENT"> <upgrade> @@ -345,5 +351,14 @@ </upgrade> </component> </service> + + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <upgrade> + <task xsi:type="restart" /> + </upgrade> + </component> + </service> + </processing> </upgrade>
