http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 4ca9304..0ac1679 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 @@ -122,9 +122,6 @@ class LivyServer(Script): else: Logger.info("DFS directory '" + dir_path + "' exists.") - def get_component_name(self): - return "livy-server" - def pre_upgrade_restart(self, env, upgrade_type=None): import params @@ -132,7 +129,7 @@ class LivyServer(Script): 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("livy-server", params.version) + stack_select.select_packages(params.version) def get_log_folder(self): import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 31bf4c6..a2e26b8 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 @@ -51,9 +51,6 @@ class SparkClient(Script): def status(self, env): raise ClientComponentHasNoStatus() - def get_component_name(self): - return "spark-client" - def stack_upgrade_save_new_config(self, env): """ Because this gets called during a Rolling Upgrade, the new configs have already been saved, so we must be @@ -82,7 +79,7 @@ class SparkClient(Script): 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("spark-client", params.version) + stack_select.select_packages(params.version) if __name__ == "__main__": SparkClient().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 0c82e6f..44a156f 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 @@ -63,9 +63,6 @@ class SparkThriftServer(Script): env.set_params(status_params) check_process_status(status_params.spark_thrift_server_pid_file) - def get_component_name(self): - return "spark-thriftserver" - def pre_upgrade_restart(self, env, upgrade_type=None): import params @@ -73,7 +70,7 @@ class SparkThriftServer(Script): 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("spark-thriftserver", params.version) + stack_select.select_packages(params.version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 d2b32ae..793ffa3 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 @@ -68,9 +68,6 @@ class JobHistoryServer(Script): check_process_status(status_params.spark_history_server_pid_file) - def get_component_name(self): - return "spark2-historyserver" - def pre_upgrade_restart(self, env, upgrade_type=None): import params @@ -78,7 +75,7 @@ class JobHistoryServer(Script): 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("spark2-historyserver", 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 # need to copy the tarball, otherwise, copy it. http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 cb4f5ee..79022b8 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 @@ -125,9 +125,6 @@ class LivyServer(Script): else: Logger.info("DFS directory '" + dir_path + "' exists.") - def get_component_name(self): - return "livy2-server" - def pre_upgrade_restart(self, env, upgrade_type=None): import params @@ -135,7 +132,7 @@ class LivyServer(Script): 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("livy2-server", params.version) + stack_select.select_packages(params.version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 0a43750..1db4429 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 @@ -44,9 +44,6 @@ class SparkClient(Script): def status(self, env): raise ClientComponentHasNoStatus() - def get_component_name(self): - return "spark2-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params @@ -54,7 +51,7 @@ class SparkClient(Script): 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("spark2-client", params.version) + stack_select.select_packages(params.version) if __name__ == "__main__": SparkClient().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 6fdd324..e0dc11d 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 @@ -63,16 +63,13 @@ class SparkThriftServer(Script): env.set_params(status_params) check_process_status(status_params.spark_thrift_server_pid_file) - def get_component_name(self): - return "spark2-thriftserver" - def pre_upgrade_restart(self, env, upgrade_type=None): import params 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("spark2-thriftserver", params.version) + stack_select.select_packages(params.version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py index bb503f5..5b48ffd 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/service_check.py @@ -33,9 +33,6 @@ class SqoopServiceCheck(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class SqoopServiceCheckDefault(SqoopServiceCheck): - def get_component_name(self): - return "sqoop-server" - def service_check(self, env): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 d420fab..8c7dd35 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 @@ -46,16 +46,13 @@ class SqoopClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class SqoopClientDefault(SqoopClient): - def get_component_name(self): - return "sqoop-client" - def pre_upgrade_restart(self, env, upgrade_type=None): 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) - stack_select.select("sqoop-client", params.version) + stack_select.select_packages(params.version) @OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 d0af415..7da3fa1 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 @@ -36,9 +36,6 @@ from resource_management.libraries.functions.security_commons import build_expec class DrpcServer(Script): - def get_component_name(self): - return "storm-client" - def install(self, env): self.install_packages(env) self.configure(env) @@ -55,7 +52,7 @@ class DrpcServer(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "storm", params.version) - stack_select.select("storm-client", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 ab6dc3e..53b965e 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 @@ -38,9 +38,6 @@ from ambari_commons.os_family_impl import OsFamilyImpl from resource_management.core.resources.service import Service class Nimbus(Script): - def get_component_name(self): - return "storm-nimbus" - def install(self, env): self.install_packages(env) self.configure(env) @@ -59,9 +56,7 @@ class NimbusDefault(Nimbus): 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("storm-client", params.version) - stack_select.select("storm-nimbus", params.version) - + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 39bda4d..18d8fea 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 @@ -31,9 +31,6 @@ from resource_management.libraries.functions import StackFeature class Nimbus(Script): - def get_component_name(self): - return "storm-nimbus" - def install(self, env): self.install_packages(env) self.configure(env) @@ -50,8 +47,7 @@ class Nimbus(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "storm", params.version) - stack_select.select("storm-client", params.version) - stack_select.select("storm-nimbus", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 6da204e..fc45bc1 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 @@ -36,9 +36,6 @@ from resource_management.libraries.functions.security_commons import build_expec class PaceMaker(Script): - def get_component_name(self): - return "storm-client" - def install(self, env): self.install_packages(env) self.configure(env) @@ -54,7 +51,7 @@ class PaceMaker(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "storm", params.version) - stack_select.select("storm-client", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/rest_api.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/rest_api.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/rest_api.py index 26fdb27..fd301d9 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/rest_api.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/rest_api.py @@ -38,9 +38,6 @@ class StormRestApi(Script): In HDP 2.2, it was removed since the functionality was moved to Storm UI Server. """ - def get_component_name(self): - return "storm-client" - def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 da900f9..318bd0b 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 @@ -35,9 +35,6 @@ from resource_management.core.resources.service import Service class Supervisor(Script): - def get_component_name(self): - return "storm-supervisor" - def install(self, env): self.install_packages(env) self.configure(env) @@ -77,8 +74,7 @@ class SupervisorDefault(Supervisor): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "storm", params.version) - stack_select.select("storm-client", params.version) - stack_select.select("storm-supervisor", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 d6c3545..46626bc 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 @@ -33,9 +33,6 @@ from resource_management.libraries.functions import StackFeature class Supervisor(Script): - def get_component_name(self): - return "storm-supervisor" - def install(self, env): self.install_packages(env) self.configure(env) @@ -51,8 +48,7 @@ class Supervisor(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "storm", params.version) - stack_select.select("storm-client", params.version) - stack_select.select("storm-supervisor", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 5d0c303..90ec64c 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 @@ -42,9 +42,6 @@ from resource_management.core.resources.service import Service class UiServer(Script): - def get_component_name(self): - return "storm-client" - def install(self, env): self.install_packages(env) self.configure(env) @@ -82,7 +79,7 @@ class UiServerDefault(UiServer): 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("storm-client", params.version) + stack_select.select_packages(params.version) def link_metrics_sink_jar(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/SYSTEMML/0.10.0/package/scripts/systemml_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SYSTEMML/0.10.0/package/scripts/systemml_client.py b/ambari-server/src/main/resources/common-services/SYSTEMML/0.10.0/package/scripts/systemml_client.py index 2d45b68..8ae1447 100755 --- a/ambari-server/src/main/resources/common-services/SYSTEMML/0.10.0/package/scripts/systemml_client.py +++ b/ambari-server/src/main/resources/common-services/SYSTEMML/0.10.0/package/scripts/systemml_client.py @@ -26,16 +26,13 @@ from resource_management.libraries.functions import stack_select class SystemMLClient(Script): - def get_component_name(self): - return "systemml-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): #conf_select.select(params.stack_name, "systemml", params.version) - stack_select.select("systemml-client", params.version) + stack_select.select_packages(params.version) def install(self, env): self.install_packages(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/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 8018f0f..8a6a6d3 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 @@ -58,9 +58,6 @@ class TezClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class TezClientLinux(TezClient): - def get_component_name(self): - return "hadoop-client" - def stack_upgrade_save_new_config(self, env): """ Because this gets called during a Rolling Upgrade, the new tez configs have already been saved, so we must be @@ -90,7 +87,7 @@ class TezClientLinux(TezClient): 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("hadoop-client", params.version) + stack_select.select_packages(params.version) def install(self, env): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_client.py b/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_client.py index 9bb1aad..2d0a93e 100755 --- a/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_client.py +++ b/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_client.py @@ -31,9 +31,6 @@ import titan from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl class TitanClient(Script): - def get_component_name(self): - return "titan-client" - def configure(self, env): import params env.set_params(params) @@ -51,7 +48,7 @@ class TitanClientLinux(TitanClient): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "titan", params.version) - stack_select.select("titan-client", params.version) + stack_select.select_packages(params.version) def install(self, env): self.install_packages(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_server.py b/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_server.py index 5dcc7e9..427448b 100755 --- a/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_server.py +++ b/ambari-server/src/main/resources/common-services/TITAN/1.0.0/package/scripts/titan_server.py @@ -29,9 +29,6 @@ from titan_service import titan_service import titan class TitanServer(Script): - def get_component_name(self): - return "titan-server" - def install(self, env): self.install_packages(env) @@ -45,7 +42,7 @@ class TitanServer(Script): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): - stack_select.select("titan-server", params.version) + stack_select.select_packages(params.version) conf_select.select(params.stack_name, "titan", params.version) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py index a299e25..c4f3cfe 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py @@ -63,9 +63,6 @@ class ApplicationTimelineServerWindows(ApplicationTimelineServer): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ApplicationTimelineServerDefault(ApplicationTimelineServer): - def get_component_name(self): - return "hadoop-yarn-timelineserver" - def pre_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing Stack Upgrade pre-restart") import params @@ -73,7 +70,7 @@ class ApplicationTimelineServerDefault(ApplicationTimelineServer): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-yarn-timelineserver", params.version) + stack_select.select_packages(params.version) def status(self, env): import status_params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py index 36417a8..ff50e4e 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py @@ -70,9 +70,6 @@ class HistoryserverWindows(HistoryServer): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class HistoryServerDefault(HistoryServer): - def get_component_name(self): - return "hadoop-mapreduce-historyserver" - def pre_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing Stack Upgrade pre-restart") import params @@ -80,7 +77,7 @@ class HistoryServerDefault(HistoryServer): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-mapreduce-historyserver", params.version) + stack_select.select_packages(params.version) # MC Hammer said, "Can't touch this" copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, skip=params.sysprep_skip_copy_tarballs_hdfs) copy_to_hdfs("tez", params.user_group, params.hdfs_user, skip=params.sysprep_skip_copy_tarballs_hdfs) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py index 424157b..efcb2da 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py @@ -82,16 +82,13 @@ class MapReduce2ClientWindows(MapReduce2Client): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class MapReduce2ClientDefault(MapReduce2Client): - def get_component_name(self): - return "hadoop-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-client", params.version) + stack_select.select_packages(params.version) if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py index 7be7c36..acd0991 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py @@ -65,9 +65,6 @@ class NodemanagerWindows(Nodemanager): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class NodemanagerDefault(Nodemanager): - def get_component_name(self): - return "hadoop-yarn-nodemanager" - def pre_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing NodeManager Stack Upgrade pre-restart") import params @@ -75,7 +72,7 @@ class NodemanagerDefault(Nodemanager): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-yarn-nodemanager", params.version) + stack_select.select_packages(params.version) def post_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing NodeManager Stack Upgrade post-restart") http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py index ecd8147..2d74aa9 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py @@ -105,9 +105,6 @@ class ResourcemanagerWindows(Resourcemanager): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ResourcemanagerDefault(Resourcemanager): - def get_component_name(self): - return "hadoop-yarn-resourcemanager" - def pre_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing Stack Upgrade post-restart") import params @@ -115,7 +112,7 @@ class ResourcemanagerDefault(Resourcemanager): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-yarn-resourcemanager", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py index 4d65a40..d57060c 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py @@ -51,16 +51,13 @@ class YarnClientWindows(YarnClient): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class YarnClientDefault(YarnClient): - def get_component_name(self): - return "hadoop-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-client", params.version) + stack_select.select_packages(params.version) if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index ba46dc8..f8f6e3d 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -40,9 +40,6 @@ from resource_management.libraries.script.script import Script class Master(Script): - def get_component_name(self): - return "zeppelin-server" - def install(self, env): import params env.set_params(params) @@ -255,7 +252,7 @@ class Master(Script): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, format_stack_version(params.version)): conf_select.select(params.stack_name, "zeppelin", params.version) - stack_select.select("zeppelin-server", params.version) + stack_select.select_packages(params.version) def set_interpreter_settings(self, config_data): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py index 1d4e89c..6c60e91 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_client.py @@ -55,8 +55,6 @@ class ZookeeperClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ZookeeperClientLinux(ZookeeperClient): - def get_component_name(self): - return "zookeeper-client" def install(self, env): self.install_packages(env) @@ -69,7 +67,7 @@ class ZookeeperClientLinux(ZookeeperClient): if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, format_stack_version(params.version)): conf_select.select(params.stack_name, "zookeeper", params.version) - stack_select.select("zookeeper-client", params.version) + stack_select.select_packages(params.version) @OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY) class ZookeeperClientWindows(ZookeeperClient): http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_server.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_server.py index 0af0345..a42cfb6 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_server.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/zookeeper_server.py @@ -64,9 +64,6 @@ class ZookeeperServer(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ZookeeperServerLinux(ZookeeperServer): - def get_component_name(self): - return "zookeeper-server" - def install(self, env): self.install_packages(env) self.configure(env) @@ -78,7 +75,7 @@ class ZookeeperServerLinux(ZookeeperServer): if check_stack_feature(StackFeature.ROLLING_UPGRADE, format_stack_version(params.version)): conf_select.select(params.stack_name, "zookeeper", params.version) - stack_select.select("zookeeper-server", params.version) + stack_select.select_packages(params.version) def post_upgrade_restart(self, env, upgrade_type=None): # during an express upgrade, there is no quorum, so don't try to perform the check http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_select_packages.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_select_packages.json b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_select_packages.json new file mode 100644 index 0000000..a91a841 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_select_packages.json @@ -0,0 +1,775 @@ +{ + "BigInsights": { + "stack-select": { + "ATLAS": { + "ATLAS_CLIENT": { + "STACK-SELECT-PACKAGE": "atlas-client", + "INSTALL": [ + "atlas-client" + ], + "PATCH": [ + "atlas-client" + ], + "STANDARD": [ + "atlas-client" + ] + }, + "ATLAS_SERVER": { + "STACK-SELECT-PACKAGE": "atlas-server", + "INSTALL": [ + "atlas-server" + ], + "PATCH": [ + "atlas-server" + ], + "STANDARD": [ + "atlas-server" + ] + } + }, + "FLUME": { + "FLUME_HANDLER": { + "STACK-SELECT-PACKAGE": "flume-server", + "INSTALL": [ + "flume-server" + ], + "PATCH": [ + "flume-server" + ], + "STANDARD": [ + "flume-server" + ] + } + }, + "HBASE": { + "HBASE_CLIENT": { + "STACK-SELECT-PACKAGE": "hbase-client", + "INSTALL": [ + "hbase-client", + "hadoop-client" + ], + "PATCH": [ + "hbase-client" + ], + "STANDARD": [ + "hbase-client", + "hadoop-client" + ] + }, + "HBASE_MASTER": { + "STACK-SELECT-PACKAGE": "hbase-master", + "INSTALL": [ + "hbase-master" + ], + "PATCH": [ + "hbase-master" + ], + "STANDARD": [ + "hbase-master" + ] + }, + "HBASE_REGIONSERVER": { + "STACK-SELECT-PACKAGE": "hbase-regionserver", + "INSTALL": [ + "hbase-regionserver" + ], + "PATCH": [ + "hbase-regionserver" + ], + "STANDARD": [ + "hbase-regionserver" + ] + }, + "HBASE_REST_SERVER": { + "STACK-SELECT-PACKAGE": "hbase-restserver", + "INSTALL": [ + "hbase-restserver" + ], + "PATCH": [ + "hbase-restserver" + ], + "STANDARD": [ + "hbase-restserver" + ] + }, + + "PHOENIX_QUERY_SERVER": { + "STACK-SELECT-PACKAGE": "phoenix-server", + "INSTALL": [ + "phoenix-server" + ], + "PATCH": [ + "phoenix-server" + ], + "STANDARD": [ + "phoenix-server" + ] + } + }, + "HDFS": { + "DATANODE": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-datanode", + "INSTALL": [ + "hadoop-hdfs-datanode" + ], + "PATCH": [ + "hadoop-hdfs-datanode" + ], + "STANDARD": [ + "hadoop-hdfs-datanode" + ] + }, + "HDFS_CLIENT": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + }, + "NAMENODE": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-namenode", + "INSTALL": [ + "hadoop-hdfs-namenode" + ], + "PATCH": [ + "hadoop-hdfs-namenode" + ], + "STANDARD": [ + "hadoop-hdfs-namenode" + ] + }, + "NFS_GATEWAY": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-nfs3", + "INSTALL": [ + "hadoop-hdfs-nfs3" + ], + "PATCH": [ + "hadoop-hdfs-nfs3" + ], + "STANDARD": [ + "hadoop-hdfs-nfs3" + ] + }, + "JOURNALNODE": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-journalnode", + "INSTALL": [ + "hadoop-hdfs-journalnode" + ], + "PATCH": [ + "hadoop-hdfs-journalnode" + ], + "STANDARD": [ + "hadoop-hdfs-journalnode" + ] + }, + "SECONDARY_NAMENODE": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-secondarynamenode", + "INSTALL": [ + "hadoop-hdfs-secondarynamenode" + ], + "PATCH": [ + "hadoop-hdfs-secondarynamenode" + ], + "STANDARD": [ + "hadoop-hdfs-secondarynamenode" + ] + }, + "ZKFC": { + "STACK-SELECT-PACKAGE": "hadoop-hdfs-zkfc", + "INSTALL": [ + "hadoop-hdfs-zkfc" + ], + "PATCH": [ + "hadoop-hdfs-zkfc" + ], + "STANDARD": [ + "hadoop-hdfs-zkfc" + ] + } + }, + "HIVE": { + "HCAT": { + "STACK-SELECT-PACKAGE": "hive-webhcat", + "INSTALL": [ + "hive-webhcat" + ], + "PATCH": [ + "hive-webhcat" + ], + "STANDARD": [ + "hive-webhcat" + ] + }, + "HIVE_METASTORE": { + "STACK-SELECT-PACKAGE": "hive-metastore", + "INSTALL": [ + "hive-metastore" + ], + "PATCH": [ + "hive-metastore" + ], + "STANDARD": [ + "hive-metastore" + ] + }, + "HIVE_SERVER": { + "STACK-SELECT-PACKAGE": "hive-server2", + "INSTALL": [ + "hive-server2" + ], + "PATCH": [ + "hive-server2" + ], + "STANDARD": [ + "hive-server2" + ] + }, + "HIVE_SERVER_INTERACTIVE": { + "STACK-SELECT-PACKAGE": "hive-server2-hive2", + "INSTALL": [ + "hive-server2-hive2" + ], + "PATCH": [ + "hive-server2-hive2" + ], + "STANDARD": [ + "hive-server2-hive2" + ] + }, + "HIVE_CLIENT": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + }, + "WEBHCAT_SERVER": { + "STACK-SELECT-PACKAGE": "hive-webhcat", + "INSTALL": [ + "hive-webhcat" + ], + "PATCH": [ + "hive-webhcat" + ], + "STANDARD": [ + "hive-webhcat" + ] + } + }, + "KAFKA": { + "KAFKA_BROKER": { + "STACK-SELECT-PACKAGE": "kafka-broker", + "INSTALL": [ + "kafka-broker" + ], + "PATCH": [ + "kafka-broker" + ], + "STANDARD": [ + "kafka-broker" + ] + } + }, + "KNOX": { + "KNOX_GATEWAY": { + "STACK-SELECT-PACKAGE": "knox-server", + "INSTALL": [ + "knox-server" + ], + "PATCH": [ + "knox-server" + ], + "STANDARD": [ + "knox-server" + ] + } + }, + "MAPREDUCE2": { + "HISTORYSERVER": { + "STACK-SELECT-PACKAGE": "hadoop-mapreduce-historyserver", + "INSTALL": [ + "hadoop-mapreduce-historyserver" + ], + "PATCH": [ + "hadoop-mapreduce-historyserver" + ], + "STANDARD": [ + "hadoop-mapreduce-historyserver" + ] + }, + "MAPREDUCE2_CLIENT": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + } + }, + "OOZIE": { + "OOZIE_CLIENT": { + "STACK-SELECT-PACKAGE": "oozie-client", + "INSTALL": [ + "oozie-client" + ], + "PATCH": [ + "oozie-client" + ], + "STANDARD": [ + "oozie-client" + ] + }, + "OOZIE_SERVER": { + "STACK-SELECT-PACKAGE": "oozie-server", + "INSTALL": [ + "oozie-client", + "oozie-server" + ], + "PATCH": [ + "oozie-server" + ], + "STANDARD": [ + "oozie-client", + "oozie-server" + ] + } + }, + "PIG": { + "PIG": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + } + }, + "R4ML": { + "R4ML": { + "STACK-SELECT-PACKAGE": "r4ml-client", + "INSTALL": [ + "r4ml-client" + ], + "PATCH": [ + "r4ml-client" + ], + "STANDARD": [ + "r4ml-client" + ] + } + }, + "RANGER": { + "RANGER_ADMIN": { + "STACK-SELECT-PACKAGE": "ranger-admin", + "INSTALL": [ + "ranger-admin" + ], + "PATCH": [ + "ranger-admin" + ], + "STANDARD": [ + "ranger-admin" + ] + }, + "RANGER_TAGSYNC": { + "STACK-SELECT-PACKAGE": "ranger-tagsync", + "INSTALL": [ + "ranger-tagsync" + ], + "PATCH": [ + "ranger-tagsync" + ], + "STANDARD": [ + "ranger-tagsync" + ] + }, + "RANGER_USERSYNC": { + "STACK-SELECT-PACKAGE": "ranger-usersync", + "INSTALL": [ + "ranger-usersync" + ], + "PATCH": [ + "ranger-usersync" + ], + "STANDARD": [ + "ranger-usersync" + ] + } + }, + "RANGER_KMS": { + "RANGER_KMS_SERVER": { + "STACK-SELECT-PACKAGE": "ranger-kms", + "INSTALL": [ + "ranger-kms" + ], + "PATCH": [ + "ranger-kms" + ], + "STANDARD": [ + "ranger-kms" + ] + } + }, + "SLIDER": { + "SLIDER": { + "STACK-SELECT-PACKAGE": "slider-client", + "INSTALL": [ + "slider-client", + "hadoop-client" + ], + "PATCH": [ + "slider-client" + ], + "STANDARD": [ + "slider-client", + "hadoop-client" + ] + } + }, + "SOLR": { + "SOLR": { + "STACK-SELECT-PACKAGE": "solr-server", + "INSTALL": [ + "solr-server" + ], + "PATCH": [ + "solr-server" + ], + "STANDARD": [ + "solr-server" + ] + } + }, + "SPARK": { + "LIVY_SERVER": { + "STACK-SELECT-PACKAGE": "livy-server", + "INSTALL": [ + "livy-server" + ], + "PATCH": [ + "livy-server" + ], + "STANDARD": [ + "livy-server" + ] + }, + "SPARK_CLIENT": { + "STACK-SELECT-PACKAGE": "spark-client", + "INSTALL": [ + "spark-client" + ], + "PATCH": [ + "spark-client" + ], + "STANDARD": [ + "spark-client" + ] + }, + "SPARK_JOBHISTORYSERVER": { + "STACK-SELECT-PACKAGE": "spark-historyserver", + "INSTALL": [ + "spark-historyserver" + ], + "PATCH": [ + "spark-historyserver" + ], + "STANDARD": [ + "spark-historyserver" + ] + }, + "SPARK_THRIFTSERVER": { + "STACK-SELECT-PACKAGE": "spark-thriftserver", + "INSTALL": [ + "spark-thriftserver" + ], + "PATCH": [ + "spark-thriftserver" + ], + "STANDARD": [ + "spark-thriftserver" + ] + } + }, + "SPARK2": { + "LIVY2_SERVER": { + "STACK-SELECT-PACKAGE": "livy2-server", + "INSTALL": [ + "livy2-server" + ], + "PATCH": [ + "livy2-server" + ], + "STANDARD": [ + "livy2-server" + ] + }, + "SPARK2_CLIENT": { + "STACK-SELECT-PACKAGE": "spark2-client", + "INSTALL": [ + "spark2-client" + ], + "PATCH": [ + "spark2-client" + ], + "STANDARD": [ + "spark2-client" + ] + }, + "SPARK2_JOBHISTORYSERVER": { + "STACK-SELECT-PACKAGE": "spark2-historyserver", + "INSTALL": [ + "spark2-historyserver" + ], + "PATCH": [ + "spark2-historyserver" + ], + "STANDARD": [ + "spark2-historyserver" + ] + }, + "SPARK2_THRIFTSERVER": { + "STACK-SELECT-PACKAGE": "spark2-thriftserver", + "INSTALL": [ + "spark2-thriftserver" + ], + "PATCH": [ + "spark2-thriftserver" + ], + "STANDARD": [ + "spark2-thriftserver" + ] + } + }, + "SQOOP": { + "SQOOP": { + "STACK-SELECT-PACKAGE": "sqoop-client", + "INSTALL": [ + "sqoop-client" + ], + "PATCH": [ + "sqoop-client" + ], + "STANDARD": [ + "sqoop-client" + ] + } + }, + "STORM": { + "NIMBUS": { + "STACK-SELECT-PACKAGE": "storm-nimbus", + "INSTALL": [ + "storm-client", + "storm-nimbus" + ], + "PATCH": [ + "storm-client", + "storm-nimbus" + ], + "STANDARD": [ + "storm-client", + "storm-nimbus" + ] + }, + "SUPERVISOR": { + "STACK-SELECT-PACKAGE": "storm-supervisor", + "INSTALL": [ + "storm-supervisor" + ], + "PATCH": [ + "storm-supervisor" + ], + "STANDARD": [ + "storm-client", + "storm-supervisor" + ] + }, + "DRPC_SERVER": { + "STACK-SELECT-PACKAGE": "storm-client", + "INSTALL": [ + "storm-client" + ], + "PATCH": [ + "storm-client" + ], + "STANDARD": [ + "storm-client" + ] + }, + "STORM_UI_SERVER": { + "STACK-SELECT-PACKAGE": "storm-client", + "INSTALL": [ + "storm-client" + ], + "PATCH": [ + "storm-client" + ], + "STANDARD": [ + "storm-client" + ] + } + }, + "SYSTEMML": { + "SYSTEMML": { + "STACK-SELECT-PACKAGE": "systemml-client", + "INSTALL": [ + "systemml-client" + ], + "PATCH": [ + "systemml-client" + ], + "STANDARD": [ + "systemml-client" + ] + } + }, + "TEZ": { + "TEZ_CLIENT": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + } + }, + "TITAN": { + "TITAN_CLIENT": { + "STACK-SELECT-PACKAGE": "titan-client", + "INSTALL": [ + "titan-client" + ], + "PATCH": [ + "titan-client" + ], + "STANDARD": [ + "titan-client" + ] + }, + "TITAN_SERVER": { + "STACK-SELECT-PACKAGE": "titan-server", + "INSTALL": [ + "titan-server" + ], + "PATCH": [ + "titan-server" + ], + "STANDARD": [ + "titan-server" + ] + } + }, + "YARN": { + "APP_TIMELINE_SERVER": { + "STACK-SELECT-PACKAGE": "hadoop-yarn-timelineserver", + "INSTALL": [ + "hadoop-yarn-timelineserver" + ], + "PATCH": [ + "hadoop-yarn-timelineserver" + ], + "STANDARD": [ + "hadoop-yarn-timelineserver" + ] + }, + "NODEMANAGER": { + "STACK-SELECT-PACKAGE": "hadoop-yarn-nodemanager", + "INSTALL": [ + "hadoop-yarn-nodemanager" + ], + "PATCH": [ + "hadoop-yarn-nodemanager" + ], + "STANDARD": [ + "hadoop-yarn-nodemanager" + ] + }, + "RESOURCEMANAGER": { + "STACK-SELECT-PACKAGE": "hadoop-yarn-resourcemanager", + "INSTALL": [ + "hadoop-yarn-resourcemanager" + ], + "PATCH": [ + "hadoop-yarn-resourcemanager" + ], + "STANDARD": [ + "hadoop-yarn-resourcemanager" + ] + }, + "YARN_CLIENT": { + "STACK-SELECT-PACKAGE": "hadoop-client", + "INSTALL": [ + "hadoop-client" + ], + "PATCH": [ + "hadoop-client" + ], + "STANDARD": [ + "hadoop-client" + ] + } + }, + "ZEPPELIN": { + "ZEPPELIN_MASTER": { + "STACK-SELECT-PACKAGE": "zeppelin-server", + "INSTALL": [ + "zeppelin-server" + ], + "PATCH": [ + "zeppelin-server" + ], + "STANDARD": [ + "zeppelin-server" + ] + } + }, + "ZOOKEEPER": { + "ZOOKEEPER_CLIENT": { + "STACK-SELECT-PACKAGE": "zookeeper-client", + "INSTALL": [ + "zookeeper-client" + ], + "PATCH": [ + "zookeeper-client" + ], + "STANDARD": [ + "zookeeper-client" + ] + }, + "ZOOKEEPER_SERVER": { + "STACK-SELECT-PACKAGE": "zookeeper-server", + "INSTALL": [ + "zookeeper-server" + ], + "PATCH": [ + "zookeeper-server" + ], + "STANDARD": [ + "zookeeper-server" + ] + } + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/package/scripts/flume_handler.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/package/scripts/flume_handler.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/package/scripts/flume_handler.py index d0c6e3b..159278a 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/package/scripts/flume_handler.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/package/scripts/flume_handler.py @@ -34,9 +34,6 @@ from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl class FlumeHandler(Script): - def get_component_name(self): - return "flume-server" - def install(self, env): import params self.install_packages(env) @@ -137,7 +134,7 @@ class FlumeHandler(Script): Logger.info("Executing Flume Stack Upgrade pre-restart") conf_select.select(params.stack_name, "flume", params.version) - stack_select.select("flume-server", params.version) + stack_select.select_packages(params.version) if params.upgrade_direction == Direction.UPGRADE: flume_upgrade.pre_start_restore() http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_client.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_client.py index 3ed6103..df382ce 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_client.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_client.py @@ -28,23 +28,19 @@ from hbase import hbase class HbaseClient(Script): - def get_component_name(self): - return "hbase-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hbase", params.version) - stack_select.select("hbase-client", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set hbase-client {version}")) # set all of the hadoop clientss since hbase 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) - stack_select.select("hadoop-client", params.version) #Execute(format("stack-select set hadoop-client {version}")) def install(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_master.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_master.py index b1b6cc4..b20180e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_master.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_master.py @@ -29,10 +29,6 @@ from hbase_decommission import hbase_decommission import upgrade class HbaseMaster(Script): - - def get_component_name(self): - return "hbase-master" - def install(self, env): self.install_packages(env) @@ -45,7 +41,7 @@ class HbaseMaster(Script): def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - upgrade.prestart(env, "hbase-master") + upgrade.prestart(env) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_regionserver.py index 696b173..48f0502 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_regionserver.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_regionserver.py @@ -30,9 +30,6 @@ import upgrade class HbaseRegionServer(Script): - def get_component_name(self): - return "hbase-regionserver" - def install(self, env): self.install_packages(env) @@ -45,7 +42,7 @@ class HbaseRegionServer(Script): def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - upgrade.prestart(env, "hbase-regionserver") + upgrade.prestart(env) def post_upgrade_restart(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_restgatewayserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_restgatewayserver.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_restgatewayserver.py index f8dc53d..6280e9a 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_restgatewayserver.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/hbase_restgatewayserver.py @@ -29,9 +29,6 @@ import upgrade class HbaseRestGatewayServer(Script): - def get_component_name(self): - return "hbase-restserver" - def install(self, env): self.install_packages(env) @@ -44,7 +41,7 @@ class HbaseRestGatewayServer(Script): def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) - upgrade.prestart(env, "hbase-restserver") + upgrade.prestart(env) def post_upgrade_restart(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/upgrade.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/upgrade.py index 11b770d..f1024c5 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/package/scripts/upgrade.py @@ -26,12 +26,12 @@ from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.version import compare_versions, format_stack_version from resource_management.libraries.functions.decorator import retry -def prestart(env, component): +def prestart(env): import params if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hbase", params.version) - stack_select.select(component, params.version) + stack_select.select_packages(params.version) def post_regionserver(env): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/datanode.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/datanode.py index 5d1e18b..b1f1d00 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/datanode.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/datanode.py @@ -61,16 +61,13 @@ class DataNode(Script): env.set_params(status_params) check_process_status(status_params.datanode_pid_file) - def get_component_name(self): - return "hadoop-hdfs-datanode" - def pre_upgrade_restart(self, env, upgrade_type=None): Logger.info("Executing DataNode Stack Upgrade pre-restart") import params env.set_params(params) if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-hdfs-datanode", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set hadoop-hdfs-datanode {version}")) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/hdfs_client.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/hdfs_client.py index 39cd1f4..851afd6 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/hdfs_client.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/hdfs_client.py @@ -29,9 +29,6 @@ from utils import service class HdfsClient(Script): - def get_component_name(self): - return "hadoop-client" - def install(self, env): import params @@ -44,7 +41,7 @@ class HdfsClient(Script): env.set_params(params) if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-client", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=False): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/journalnode.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/journalnode.py index 1bbbd50..afc54be 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/journalnode.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/journalnode.py @@ -34,9 +34,6 @@ import journalnode_upgrade class JournalNode(Script): - def get_component_name(self): - return "hadoop-hdfs-journalnode" - def install(self, env): import params @@ -50,7 +47,7 @@ class JournalNode(Script): if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-hdfs-journalnode", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set hadoop-hdfs-journalnode {version}")) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode.py index 46bd926..38ad927 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode.py @@ -55,9 +55,6 @@ except ImportError: class NameNode(Script): - def get_component_name(self): - return "hadoop-hdfs-namenode" - def install(self, env): import params @@ -88,7 +85,7 @@ class NameNode(Script): if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-hdfs-namenode", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set hadoop-hdfs-namenode {version}")) def start(self, env, upgrade_type=None): http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/nfsgateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/nfsgateway.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/nfsgateway.py index ff4778a..8edd037 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/nfsgateway.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/nfsgateway.py @@ -31,9 +31,6 @@ from resource_management.libraries.functions.version import compare_versions, fo class NFSGateway(Script): - def get_component_name(self): - return "hadoop-hdfs-nfs3" - def install(self, env): import params @@ -47,7 +44,7 @@ class NFSGateway(Script): if Script.is_stack_greater_or_equal('4.1.0.0'): conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-hdfs-nfs3", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/snamenode.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/snamenode.py index 4224a9e..1fe89a2 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/snamenode.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/snamenode.py @@ -31,9 +31,6 @@ from hdfs import hdfs class SNameNode(Script): - def get_component_name(self): - return "hadoop-hdfs-secondarynamenode" - def install(self, env): import params @@ -48,7 +45,7 @@ class SNameNode(Script): if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-hdfs-secondarynamenode", params.version) + stack_select.select_packages(params.version) def start(self, env, upgrade_type=None): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hcat_client.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hcat_client.py index e914cf6..8ae64b9 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hcat_client.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hcat_client.py @@ -42,9 +42,7 @@ class HCatClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class HCatClientDefault(HCatClient): - def get_component_name(self): - return "hadoop-client" - + pass if __name__ == "__main__": HCatClient().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_client.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_client.py index 8d586da..5ec624c 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_client.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_client.py @@ -42,9 +42,6 @@ class HiveClient(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class HiveClientDefault(HiveClient): - def get_component_name(self): - return "hadoop-client" - def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) @@ -52,7 +49,7 @@ class HiveClientDefault(HiveClient): if params.version and compare_versions(format_stack_version(params.version), '4.1.0.0') >= 0: conf_select.select(params.stack_name, "hive", params.version) conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hadoop-client", params.version) + stack_select.select_packages(params.version) def pre_upgrade_restart(self, env, upgrade_type=None): """ @@ -75,7 +72,7 @@ class HiveClientDefault(HiveClient): # HCat client doesn't have a first-class entry in hdp-select. Since clients always # update after daemons, this ensures that the hcat directories are correct on hosts # which do not include the WebHCat daemon - stack_select.select("hive-webhcat", params.version) + stack_select.select_packages(params.version) if __name__ == "__main__": HiveClient().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_metastore.py index 0a9a066..8fcd4e4 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_metastore.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_metastore.py @@ -67,9 +67,6 @@ class HiveMetastore(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class HiveMetastoreDefault(HiveMetastore): - def get_component_name(self): - return "hive-metastore" - def status(self, env): import status_params from resource_management.libraries.functions import check_process_status @@ -89,7 +86,7 @@ class HiveMetastoreDefault(HiveMetastore): if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hive", params.version) - stack_select.select("hive-metastore", params.version) + stack_select.select_packages(params.version) def security_status(self, env): import status_params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_server.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_server.py index 5d2dc9f..269e8978 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_server.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive_server.py @@ -56,9 +56,6 @@ class HiveServer(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class HiveServerDefault(HiveServer): - def get_component_name(self): - return "hive-server2" - def start(self, env, upgrade_type=None): import params env.set_params(params) @@ -95,7 +92,7 @@ class HiveServerDefault(HiveServer): if params.version and compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0: conf_select.select(params.stack_name, "hive", params.version) - stack_select.select("hive-server2", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set hive-server2 {version}")) resource_created = copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user) if resource_created: http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/webhcat_server.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/webhcat_server.py index 7496649..627c96e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/webhcat_server.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/webhcat_server.py @@ -54,9 +54,6 @@ class WebHCatServer(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class WebHCatServerDefault(WebHCatServer): - def get_component_name(self): - return "hive-webhcat" - def status(self, env): import status_params env.set_params(status_params) @@ -70,7 +67,7 @@ class WebHCatServerDefault(WebHCatServer): if params.version and compare_versions(format_stack_version(params.version), '4.1.0.0') >= 0: # webhcat has no conf, but uses hadoop home, so verify that regular hadoop conf is set conf_select.select(params.stack_name, "hadoop", params.version) - stack_select.select("hive-webhcat", params.version) + stack_select.select_packages(params.version) def security_status(self, env): import status_params http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/kafka_broker.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/kafka_broker.py index 8799658..9fad6a7 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/kafka_broker.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/kafka_broker.py @@ -36,9 +36,6 @@ from kafka import kafka class KafkaBroker(Script): - def get_component_name(self): - return "kafka-broker" - def install(self, env): self.install_packages(env) @@ -57,7 +54,7 @@ class KafkaBroker(Script): env.set_params(params) if params.version and compare_versions(format_stack_version(params.version), '4.1.0.0') >= 0: - stack_select.select("kafka-broker", params.version) + stack_select.select_packages(params.version) if params.version and compare_versions(format_stack_version(params.version), '4.1.0.0') >= 0: conf_select.select(params.stack_name, "kafka", params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/upgrade.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/upgrade.py index 16fc526..5628297 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/package/scripts/upgrade.py @@ -80,9 +80,9 @@ def run_migration(env, upgrade_type): Logger.info("Did not find Kafka acls script: {0}".format(kafka_acls_script)) -def prestart(env, component): +def prestart(env): import params if params.version and compare_versions(format_stack_version(params.version), '4.1.0.0') >= 0: conf_select.select(params.stack_name, "kafka", params.version) - stack_select.select(component, params.version) + stack_select.select_packages(params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/package/scripts/knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/package/scripts/knox_gateway.py index 6cc97ac..99e0086 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/package/scripts/knox_gateway.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/package/scripts/knox_gateway.py @@ -43,10 +43,6 @@ from knox_ldap import ldap class KnoxGateway(Script): - - def get_component_name(self): - return "knox-server" - def install(self, env): self.install_packages(env) import params @@ -115,7 +111,7 @@ class KnoxGateway(Script): # conf-select will change the symlink to the conf folder. conf_select.select(params.stack_name, "knox", params.version) - stack_select.select("knox-server", params.version) + stack_select.select_packages(params.version) # Extract the tar of the old conf folder into the new conf directory if absolute_backup_dir is not None and params.upgrade_direction and params.upgrade_direction == Direction.UPGRADE: http://git-wip-us.apache.org/repos/asf/ambari/blob/56d2ade2/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie_client.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie_client.py index b36d2ec..a7a205b 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie_client.py @@ -29,9 +29,6 @@ from oozie_service import oozie_service class OozieClient(Script): - def get_component_name(self): - return "oozie-client" - def install(self, env): self.install_packages(env) self.configure(env) @@ -58,7 +55,7 @@ class OozieClient(Script): Logger.info("Executing Oozie Client Rolling Upgrade pre-restart") conf_select.select(params.stack_name, "oozie", params.version) - stack_select.select("oozie-client", params.version) + stack_select.select_packages(params.version) #Execute(format("stack-select set oozie-client {version}")) # We substitute some configs (oozie.authentication.kerberos.principal) before generation (see oozie.py and params.py).
