http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py index 9bd5c6e..e3a4f36 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py @@ -19,7 +19,7 @@ Ambari Agent """ from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.stack_features import check_stack_feature @@ -77,8 +77,6 @@ class WebHCatServerDefault(WebHCatServer): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): # webhcat has no conf, but uses hadoop home, so verify that regular hadoop conf is set - conf_select.select(params.stack_name, "hive-hcatalog", params.version) - conf_select.select(params.stack_name, "hadoop", params.version) stack_select.select_packages(params.version) def get_log_folder(self):
http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py index 23fcaed..7ddd1ab 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py @@ -19,7 +19,6 @@ limitations under the License. from resource_management import Script from resource_management.core.logger import Logger from resource_management.core.resources.system import Execute, File, Directory -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import Direction from resource_management.libraries.functions.version import format_stack_version @@ -51,9 +50,6 @@ class KafkaBroker(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): stack_select.select_packages(params.version) - if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, params.version): - conf_select.select(params.stack_name, "kafka", params.version) - # This is extremely important since it should only be called if crossing the HDP 2.3.4.0 boundary. if params.current_version and params.version and params.upgrade_direction: src_version = dst_version = None http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py index 23fcaed..0910156 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py @@ -19,7 +19,6 @@ limitations under the License. from resource_management import Script from resource_management.core.logger import Logger from resource_management.core.resources.system import Execute, File, Directory -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import Direction from resource_management.libraries.functions.version import format_stack_version @@ -51,10 +50,7 @@ class KafkaBroker(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): stack_select.select_packages(params.version) - if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, params.version): - conf_select.select(params.stack_name, "kafka", params.version) - - # This is extremely important since it should only be called if crossing the HDP 2.3.4.0 boundary. + # This is extremely important since it should only be called if crossing the HDP 2.3.4.0 boundary. if params.current_version and params.version and params.upgrade_direction: src_version = dst_version = None if params.upgrade_direction == Direction.UPGRADE: http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py index b086bef..456d6b4 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py @@ -22,7 +22,7 @@ import os from resource_management.libraries.script.script import Script from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import Direction from resource_management.libraries.functions.security_commons import build_expectations from resource_management.libraries.functions.security_commons import cached_kinit_executor @@ -116,8 +116,6 @@ class KnoxGatewayDefault(KnoxGateway): absolute_backup_dir = upgrade.backup_data() Logger.info("Knox data was successfully backed up to {0}".format(absolute_backup_dir)) - # <conf-selector-tool> will change the symlink to the conf folder. - conf_select.select(params.stack_name, "knox", params.version) stack_select.select_packages(params.version) # seed the new Knox data directory with the keystores of yesteryear http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox_gateway.py index b086bef..456d6b4 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox_gateway.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox_gateway.py @@ -22,7 +22,7 @@ import os from resource_management.libraries.script.script import Script from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import Direction from resource_management.libraries.functions.security_commons import build_expectations from resource_management.libraries.functions.security_commons import cached_kinit_executor @@ -116,8 +116,6 @@ class KnoxGatewayDefault(KnoxGateway): absolute_backup_dir = upgrade.backup_data() Logger.info("Knox data was successfully backed up to {0}".format(absolute_backup_dir)) - # <conf-selector-tool> will change the symlink to the conf folder. - conf_select.select(params.stack_name, "knox", params.version) stack_select.select_packages(params.version) # seed the new Knox data directory with the keystores of yesteryear http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py index b598d17..33ec513 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py @@ -21,7 +21,6 @@ Ambari Agent from resource_management.core.logger import Logger from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import conf_select from resource_management.libraries.script import Script from mahout import mahout from resource_management.libraries.functions.default import default @@ -34,7 +33,6 @@ class MahoutClient(Script): import params env.set_params(params) - conf_select.select(params.stack_name, "mahout", params.version) stack_select.select_packages(params.version) def install(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py index f06d90a..6fbd66a 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py @@ -20,7 +20,7 @@ limitations under the License. import sys from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.core.logger import Logger @@ -57,7 +57,6 @@ class OozieClient(Script): return Logger.info("Executing Oozie Client Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "oozie", params.version) stack_select.select_packages(params.version) # We substitute some configs (oozie.authentication.kerberos.principal) before generation (see oozie.py and params.py). http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py index e823941..81497bc 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py @@ -20,7 +20,6 @@ limitations under the License. from resource_management.core import Logger from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature @@ -67,9 +66,6 @@ class OozieServer(Script): # Sets the symlink : eg: <stack-root>/current/oozie-server -> <stack-root>/a.b.c.d-<version>/oozie stack_select.select_packages(params.version) - if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, params.version): - conf_select.select(params.stack_name, "oozie", params.version) - env.set_params(params) oozie(is_server=True) @@ -122,7 +118,6 @@ class OozieServerDefault(OozieServer): Logger.info("Executing Oozie Server Stack Upgrade pre-restart") if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "oozie", params.version) stack_select.select_packages(params.version) OozieUpgrade.prepare_libext_directory() http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py index f06d90a..6fbd66a 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py @@ -20,7 +20,7 @@ limitations under the License. import sys from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.core.logger import Logger @@ -57,7 +57,6 @@ class OozieClient(Script): return Logger.info("Executing Oozie Client Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "oozie", params.version) stack_select.select_packages(params.version) # We substitute some configs (oozie.authentication.kerberos.principal) before generation (see oozie.py and params.py). http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_server.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_server.py index 8af08b6..6d7766f 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_server.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_server.py @@ -20,7 +20,6 @@ limitations under the License. from resource_management.core import Logger from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature @@ -68,9 +67,6 @@ class OozieServer(Script): # Sets the symlink : eg: <stack-root>/current/oozie-server -> <stack-root>/a.b.c.d-<version>/oozie stack_select.select_packages(params.version) - if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, params.version): - conf_select.select(params.stack_name, "oozie", params.version) - env.set_params(params) oozie(is_server=True) @@ -123,7 +119,6 @@ class OozieServerDefault(OozieServer): Logger.info("Executing Oozie Server Stack Upgrade pre-restart") if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "oozie", params.version) stack_select.select_packages(params.version) OozieUpgrade.prepare_libext_directory() http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py index 9a33c88..7ded264 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py @@ -22,7 +22,7 @@ Ambari Agent import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from pig import pig @@ -47,8 +47,6 @@ class PigClientLinux(PigClient): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "pig", params.version) - conf_select.select(params.stack_name, "hadoop", params.version) stack_select.select_packages(params.version) def install(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/pig_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/pig_client.py b/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/pig_client.py index 9a33c88..7ded264 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/pig_client.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.16.1.3.0/package/scripts/pig_client.py @@ -22,7 +22,7 @@ Ambari Agent import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from pig import pig @@ -47,8 +47,6 @@ class PigClientLinux(PigClient): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "pig", params.version) - conf_select.select(params.stack_name, "hadoop", params.version) stack_select.select_packages(params.version) def install(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py index e27a03e..f779c18 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py @@ -20,7 +20,6 @@ limitations under the License. from resource_management.core.exceptions import Fail from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions.constants import Direction from resource_management.libraries.script import Script from resource_management.core.resources.system import Execute, File @@ -33,7 +32,6 @@ from setup_ranger_xml import setup_ranger_audit_solr, setup_ranger_admin_passwd_ from resource_management.libraries.functions import solr_cloud_util from ambari_commons.constants import UPGRADE_TYPE_NON_ROLLING, UPGRADE_TYPE_ROLLING from resource_management.libraries.functions.constants import Direction -import upgrade import os, errno class RangerAdmin(Script): @@ -75,7 +73,7 @@ class RangerAdmin(Script): import params env.set_params(params) - upgrade.prestart(env, "ranger-admin") + stack_select.select_packages(params.version) self.set_ru_rangeradmin_in_progress(params.upgrade_marker_file) @@ -204,11 +202,7 @@ class RangerAdmin(Script): if upgrade_stack is None: raise Fail('Unable to determine the stack and stack version') - stack_name = upgrade_stack[0] - stack_version = upgrade_stack[1] - stack_select.select_packages(params.version) - conf_select.select(stack_name, "ranger-admin", stack_version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py index c9b5c4f..3aae8ff 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py @@ -18,7 +18,6 @@ limitations under the License. """ from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.core.resources.system import Execute, File from resource_management.libraries.functions.check_process_status import check_process_status @@ -29,7 +28,6 @@ from resource_management.core import shell from ranger_service import ranger_service from setup_ranger_xml import ranger, ranger_credential_helper from resource_management.core.exceptions import Fail -import upgrade class RangerTagsync(Script): @@ -85,7 +83,6 @@ class RangerTagsync(Script): if params.stack_supports_ranger_tagsync: Logger.info("Executing Ranger Tagsync Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "ranger-tagsync", params.version) stack_select.select_packages(params.version) def get_log_folder(self): @@ -109,11 +106,8 @@ class RangerTagsync(Script): if upgrade_stack is None: raise Fail('Unable to determine the stack and stack version') - stack_name = upgrade_stack[0] - stack_version = upgrade_stack[1] - stack_select.select_packages(params.version) - conf_select.select(stack_name, "ranger-tagsync", stack_version) + if params.stack_supports_ranger_tagsync_ssl_xml_support: Logger.info("Upgrading Tagsync, stack support Atlas user for Tagsync, creating keystore for same.") self.create_atlas_user_keystore(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py index 8654bc2..cc0075b 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_usersync.py @@ -22,12 +22,12 @@ from resource_management.libraries.script import Script from resource_management.core.resources.system import Execute, File from resource_management.core.exceptions import ComponentIsNotRunning from resource_management.libraries.functions.format import format +from resource_management.libraries.functions import stack_select from resource_management.core.logger import Logger from resource_management.core import shell from ranger_service import ranger_service from ambari_commons.constants import UPGRADE_TYPE_NON_ROLLING, UPGRADE_TYPE_ROLLING from resource_management.libraries.functions.constants import Direction -import upgrade import os class RangerUsersync(Script): @@ -107,7 +107,7 @@ class RangerUsersync(Script): def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - upgrade.prestart(env, "ranger-usersync") + stack_select.select_packages(params.version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py deleted file mode 100644 index ca1b2bf..0000000 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py +++ /dev/null @@ -1,31 +0,0 @@ - -#!/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.core.resources.system import Execute -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions.format import format - -def prestart(env, stack_component): - import params - - if params.version and params.stack_supports_rolling_upgrade: - conf_select.select(params.stack_name, stack_component, params.version) - stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_admin.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_admin.py index b13d6ed..a9e2857 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_admin.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_admin.py @@ -20,7 +20,6 @@ limitations under the License. from resource_management.core.exceptions import Fail from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions.constants import Direction from resource_management.libraries.script import Script from resource_management.core.resources.system import Execute, File @@ -68,7 +67,7 @@ class RangerAdmin(Script): import params env.set_params(params) - upgrade.prestart(env, "ranger-admin") + upgrade.prestart(env) self.set_ru_rangeradmin_in_progress(params.upgrade_marker_file) @@ -193,7 +192,6 @@ class RangerAdmin(Script): stack_version = upgrade_stack[1] stack_select.select_packages(params.version) - conf_select.select(stack_name, "ranger-admin", stack_version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_tagsync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_tagsync.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_tagsync.py index 35f9fe6..85963cf 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_tagsync.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_tagsync.py @@ -18,7 +18,6 @@ limitations under the License. """ from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.core.resources.system import Execute, File from resource_management.libraries.functions.check_process_status import check_process_status @@ -85,7 +84,6 @@ class RangerTagsync(Script): if params.stack_supports_ranger_tagsync: Logger.info("Executing Ranger Tagsync Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "ranger-tagsync", params.version) stack_select.select_packages(params.version) @@ -110,11 +108,8 @@ class RangerTagsync(Script): if upgrade_stack is None: raise Fail('Unable to determine the stack and stack version') - stack_name = upgrade_stack[0] - stack_version = upgrade_stack[1] - stack_select.select_packages(params.version) - conf_select.select(stack_name, "ranger-tagsync", stack_version) + if params.stack_supports_ranger_tagsync_ssl_xml_support: Logger.info("Upgrading Tagsync, stack support Atlas user for Tagsync, creating keystore for same.") self.create_atlas_user_keystore(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_usersync.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_usersync.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_usersync.py index fa5a320..7d5ec29 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_usersync.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/ranger_usersync.py @@ -103,7 +103,7 @@ class RangerUsersync(Script): def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - upgrade.prestart(env, "ranger-usersync") + upgrade.prestart(env) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/upgrade.py index ca1b2bf..597c868 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/upgrade.py @@ -19,13 +19,11 @@ limitations under the License. """ from resource_management.core.resources.system import Execute -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.format import format -def prestart(env, stack_component): +def prestart(env): import params if params.version and params.stack_supports_rolling_upgrade: - conf_select.select(params.stack_name, stack_component, params.version) stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py index 0bd11f3..fcf2478 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms_server.py @@ -29,7 +29,6 @@ from resource_management.core import shell from resource_management.libraries.functions.default import default from kms import kms, setup_kms_db, setup_java_patch, enable_kms_plugin, setup_kms_jce, update_password_configs from kms_service import kms_service -import upgrade class KmsServer(Script): @@ -94,7 +93,7 @@ class KmsServer(Script): import params env.set_params(params) - upgrade.prestart(env, "ranger-kms") + stack_select.select_packages(params.version) kms(upgrade_type=upgrade_type) setup_java_patch() http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/upgrade.py deleted file mode 100644 index 73c32ff..0000000 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/upgrade.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/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.core.resources.system import Execute -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions.format import format - -def prestart(env, stack_component): - import params - - if params.version and params.stack_supports_config_versioning: - conf_select.select(params.stack_name, stack_component, params.version) - stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms_server.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms_server.py index 3b138fc..4c313c4 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms_server.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms_server.py @@ -86,7 +86,7 @@ class KmsServer(Script): import params env.set_params(params) - upgrade.prestart(env, "ranger-kms") + upgrade.prestart(env) kms(upgrade_type=upgrade_type) setup_java_patch() http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/upgrade.py index 73c32ff..465d54e 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/upgrade.py @@ -22,9 +22,8 @@ from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.format import format -def prestart(env, stack_component): +def prestart(env): import params if params.version and params.stack_supports_config_versioning: - conf_select.select(params.stack_name, stack_component, params.version) stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py index 9284c81..45c7785 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py @@ -19,7 +19,7 @@ limitations under the License. """ from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from slider import slider @@ -38,14 +38,8 @@ class SliderClientLinux(SliderClient): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "slider", params.version) stack_select.select_packages(params.version) - # also set all of the hadoop clients since slider client is upgraded as - # part of the final "CLIENTS" group and we need to ensure that - # hadoop-client is also set - conf_select.select(params.stack_name, "hadoop", params.version) - def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider_client.py b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider_client.py index 9284c81..45c7785 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider_client.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider_client.py @@ -19,7 +19,7 @@ limitations under the License. """ from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from slider import slider @@ -38,14 +38,8 @@ class SliderClientLinux(SliderClient): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "slider", params.version) stack_select.select_packages(params.version) - # also set all of the hadoop clients since slider client is upgraded as - # part of the final "CLIENTS" group and we need to ensure that - # hadoop-client is also set - conf_select.select(params.stack_name, "hadoop", params.version) - def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py index 9bdc4b9..009adbd 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/job_history_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.copy_tarball import copy_to_hdfs from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.stack_features import check_stack_feature @@ -73,7 +73,6 @@ class JobHistoryServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark Job History Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark", params.version) stack_select.select_packages(params.version) # Spark 1.3.1.2.3, and higher, which was included in HDP 2.3, does not have a dependency on Tez, so it does not http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_server.py index ae26fac..726f94f 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_server.py @@ -31,7 +31,7 @@ from resource_management import shell from resource_management.libraries.functions.decorator import retry from resource_management.core.logger import Logger from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from livy_service import livy_service from setup_livy import setup_livy @@ -132,7 +132,6 @@ class LivyServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Livy Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py index a2e26b8..8136a18 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_client.py @@ -23,7 +23,7 @@ import sys # Local imports from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.core.exceptions import ClientComponentHasNoStatus @@ -69,7 +69,6 @@ class SparkClient(Script): # Because this script was called from ru_execute_tasks.py which already enters an Environment with its own basedir, # must change it now so this function can find the Jinja Templates for the service. env.config.basedir = base_dir - conf_select.select(params.stack_name, conf_select_name, params.version) self.configure(env, config_dir=config_dir, upgrade_type=UPGRADE_TYPE_ROLLING) def pre_upgrade_restart(self, env, upgrade_type=None): @@ -78,7 +77,6 @@ class SparkClient(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark Client Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark", params.version) stack_select.select_packages(params.version) if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py index 7d595f2..f8e571b 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/spark_thrift_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.check_process_status import check_process_status @@ -68,7 +68,6 @@ class SparkThriftServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark Thrift Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/job_history_server.py index 9935063..7cbb646 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/job_history_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/job_history_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.copy_tarball import copy_to_hdfs from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.stack_features import check_stack_feature @@ -74,7 +74,6 @@ class JobHistoryServer(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark Job History Server Stack Upgrade pre-restart") # TODO, change to "spark" after RPM switches the name - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) # Spark 1.3.1.2.3, and higher, which was included in HDP 2.3, does not have a dependency on Tez, so it does not http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_server.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_server.py index e801639..1bbb9c3 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_server.py @@ -31,7 +31,7 @@ from resource_management import shell from resource_management.libraries.functions.decorator import retry from resource_management.core.logger import Logger from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from livy_service import livy_service from setup_livy import setup_livy @@ -132,7 +132,6 @@ class LivyServer(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Livy Server Stack Upgrade pre-restart") # TODO, change to "spark" and "livy" after RPM switches the name - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_client.py index 2ff69e7..8c3a52c 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_client.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_client.py @@ -20,7 +20,7 @@ limitations under the License. import sys from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.core.exceptions import ClientComponentHasNoStatus @@ -50,7 +50,6 @@ class SparkClient(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark Client Stack Upgrade pre-restart") # TODO, change to "spark" after RPM switches the name - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_thrift_server.py index 6a1bd87..aff1a34 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_thrift_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/spark_thrift_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.check_process_status import check_process_status @@ -68,7 +68,6 @@ class SparkThriftServer(Script): env.set_params(params) Logger.info("Executing Spark Thrift Server Stack Upgrade pre-restart") # TODO, change to "spark" after RPM switches the name - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py index b6a792a..311b6b2 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.copy_tarball import copy_to_hdfs from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.stack_features import check_stack_feature @@ -73,7 +73,6 @@ class JobHistoryServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark2 Job History Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) # Spark 1.3.1.2.3, and higher, which was included in HDP 2.3, does not have a dependency on Tez, so it does not http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py index c710757..50604d4 100644 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py @@ -31,7 +31,7 @@ from resource_management import shell from resource_management.libraries.functions.decorator import retry from resource_management.core.logger import Logger from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from livy2_service import livy2_service from setup_livy2 import setup_livy @@ -131,7 +131,6 @@ class LivyServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Livy2 Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py index 6b0cd89..0c7c4c3 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py @@ -20,7 +20,7 @@ limitations under the License. import sys from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.core.exceptions import ClientComponentHasNoStatus @@ -49,7 +49,6 @@ class SparkClient(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): Logger.info("Executing Spark2 Client Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark", params.version) stack_select.select_packages(params.version) if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py index 7c7982b..a0900f9 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py @@ -22,7 +22,7 @@ import sys import os from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.check_process_status import check_process_status @@ -67,7 +67,6 @@ class SparkThriftServer(Script): env.set_params(params) Logger.info("Executing Spark2 Thrift Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark2", params.version) stack_select.select_packages(params.version) def get_log_folder(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py index 8c7dd35..6c637b9 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/sqoop_client.py @@ -22,7 +22,6 @@ from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.core.resources.system import Execute from resource_management.libraries.functions.default import default from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.format import format from resource_management.libraries.functions import StackFeature @@ -50,8 +49,7 @@ class SqoopClientDefault(SqoopClient): import params env.set_params(params) - if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "sqoop", params.version) + if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop_client.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop_client.py index 8c7dd35..6c637b9 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop_client.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop_client.py @@ -22,7 +22,6 @@ from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.core.resources.system import Execute from resource_management.libraries.functions.default import default from resource_management.libraries.script.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.format import format from resource_management.libraries.functions import StackFeature @@ -50,8 +49,7 @@ class SqoopClientDefault(SqoopClient): import params env.set_params(params) - if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "sqoop", params.version) + if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/drpc_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/drpc_server.py index 06f6de9..7d483b6 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/drpc_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/drpc_server.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -51,7 +50,6 @@ class DrpcServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py index bf38a2d..1d000bf 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py @@ -22,7 +22,6 @@ import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script from resource_management.libraries.functions import format -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.core.resources.system import Execute from resource_management.libraries.functions.stack_features import check_stack_feature @@ -55,7 +54,6 @@ class NimbusDefault(Nimbus): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus_prod.py index 18d8fea..26c23d4 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus_prod.py @@ -22,7 +22,6 @@ import sys from resource_management.libraries.script import Script from storm import storm from supervisord_service import supervisord_service, supervisord_check_status -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -46,7 +45,6 @@ class Nimbus(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/pacemaker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/pacemaker.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/pacemaker.py index f111f25..c348c20 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/pacemaker.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/pacemaker.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -50,7 +49,6 @@ class PaceMaker(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor.py index 6c88a9e..198d17a 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -73,7 +72,6 @@ class SupervisorDefault(Supervisor): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor_prod.py index 46626bc..c98346b 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisor_prod.py @@ -23,7 +23,6 @@ from storm import storm from service import service from supervisord_service import supervisord_service, supervisord_check_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -47,7 +46,6 @@ class Supervisor(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/ui_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/ui_server.py index 571784c..1f20f36 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/ui_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/ui_server.py @@ -24,7 +24,6 @@ from service import service from service_check import ServiceCheck from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Link @@ -78,7 +77,6 @@ class UiServerDefault(UiServer): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def link_metrics_sink_jar(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/drpc_server.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/drpc_server.py index 06f6de9..7d483b6 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/drpc_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/drpc_server.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -51,7 +50,6 @@ class DrpcServer(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus.py index f641137..18823e8 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus.py @@ -22,7 +22,6 @@ import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script from resource_management.libraries.functions import format -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.core.resources.system import Execute from resource_management.libraries.functions.stack_features import check_stack_feature @@ -55,7 +54,6 @@ class NimbusDefault(Nimbus): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus_prod.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus_prod.py index 18d8fea..26c23d4 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/nimbus_prod.py @@ -22,7 +22,6 @@ import sys from resource_management.libraries.script import Script from storm import storm from supervisord_service import supervisord_service, supervisord_check_status -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -46,7 +45,6 @@ class Nimbus(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/pacemaker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/pacemaker.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/pacemaker.py index f111f25..c348c20 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/pacemaker.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/pacemaker.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -50,7 +49,6 @@ class PaceMaker(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor.py index 6c88a9e..198d17a 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor.py @@ -21,7 +21,6 @@ limitations under the License. import sys from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -73,7 +72,6 @@ class SupervisorDefault(Supervisor): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor_prod.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor_prod.py index 46626bc..c98346b 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor_prod.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisor_prod.py @@ -23,7 +23,6 @@ from storm import storm from service import service from supervisord_service import supervisord_service, supervisord_check_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Execute @@ -47,7 +46,6 @@ class Supervisor(Script): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/ui_server.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/ui_server.py index 571784c..1f20f36 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/ui_server.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/ui_server.py @@ -24,7 +24,6 @@ from service import service from service_check import ServiceCheck from resource_management.libraries.functions import check_process_status from resource_management.libraries.script import Script -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import format from resource_management.core.resources.system import Link @@ -78,7 +77,6 @@ class UiServerDefault(UiServer): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "storm", params.version) stack_select.select_packages(params.version) def link_metrics_sink_jar(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py index 8a6a6d3..ed3f5fd 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/tez_client.py @@ -28,7 +28,6 @@ from ambari_commons.os_utils import copy_file, extract_path_component from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.core.source import InlineTemplate -from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.functions import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature @@ -72,12 +71,9 @@ class TezClientLinux(TezClient): config_dir = self.get_config_dir_during_stack_upgrade(env, base_dir, conf_select_name) if config_dir: - Logger.info("stack_upgrade_save_new_config(): Calling conf-select on %s using version %s" % (conf_select_name, str(params.version))) - # Because this script was called from ru_execute_tasks.py which already enters an Environment with its own basedir, # must change it now so this function can find the Jinja Templates for the service. env.config.basedir = base_dir - conf_select.select(params.stack_name, conf_select_name, params.version) self.configure(env, config_dir=config_dir) def pre_upgrade_restart(self, env, upgrade_type=None): @@ -85,8 +81,6 @@ class TezClientLinux(TezClient): env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - conf_select.select(params.stack_name, "tez", params.version) - conf_select.select(params.stack_name, "hadoop", params.version) stack_select.select_packages(params.version) def install(self, env):
