Repository: ambari Updated Branches: refs/heads/branch-2.4 8c1311aaf -> 203930d23
AMBARI-17704: Livy upgrade not working (Bikas Saha via jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/203930d2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/203930d2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/203930d2 Branch: refs/heads/branch-2.4 Commit: 203930d231f0d1d925d6fc68a106a1e3abb550ce Parents: 8c1311a Author: Jayush Luniya <[email protected]> Authored: Fri Jul 15 10:18:29 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Fri Jul 15 10:19:17 2016 -0700 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/livy_server.py | 17 +++++++++++++++-- .../1.2.1/package/scripts/spark_thrift_server.py | 6 +++--- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 7 +++++++ .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 ++++++ 4 files changed, 31 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/203930d2/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 7587ab5..b5270db 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 @@ -62,7 +62,20 @@ class LivyServer(Script): return "livy-server" def pre_upgrade_restart(self, env, upgrade_type=None): - pass + import params + + 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("livy-server", params.version) + def get_log_folder(self): + import params + return params.livy_log_dir + + def get_user(self): + import params + return params.livy_user if __name__ == "__main__": - LivyServer().execute() \ No newline at end of file + LivyServer().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/203930d2/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 9311454..0c82e6f 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 @@ -70,15 +70,15 @@ class SparkThriftServer(Script): import params env.set_params(params) - if params.version and check_stack_feature(StackFeature.SPARK_THRIFTSERVER, params.version): + 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) - + def get_log_folder(self): import params return params.spark_log_dir - + def get_user(self): import params return params.hive_user http://git-wip-us.apache.org/repos/asf/ambari/blob/203930d2/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index 5267727..8c35210 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -110,6 +110,7 @@ <service name="SPARK"> <component>SPARK_JOBHISTORYSERVER</component> <component>SPARK_THRIFTSERVER</component> + <component>LIVY_SERVER</component> </service> <service name="HIVE"> @@ -464,6 +465,7 @@ <service name="SPARK"> <component>SPARK_JOBHISTORYSERVER</component> <component>SPARK_THRIFTSERVER</component> + <component>LIVY_SERVER</component> </service> </group> @@ -931,6 +933,11 @@ <task xsi:type="restart-task"/> </upgrade> </component> + <component name="LIVY_SERVER"> + <upgrade> + <task xsi:type="restart-task"/> + </upgrade> + </component> <component name="SPARK_CLIENT"> <upgrade> <task xsi:type="restart-task"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/203930d2/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index 1faf6f9..d365f79 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -238,6 +238,7 @@ <service name="SPARK"> <component>SPARK_JOBHISTORYSERVER</component> <component>SPARK_THRIFTSERVER</component> + <component>LIVY_SERVER</component> </service> </group> @@ -748,6 +749,11 @@ <task xsi:type="restart-task" /> </upgrade> </component> + <component name="LIVY_SERVER"> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> <component name="SPARK_CLIENT"> <upgrade> <task xsi:type="restart-task" />
