SLIDER-769 Modify Slider app packages for seamless integration with AMS provider (Ambari Metrics Service)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8d0e337a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8d0e337a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8d0e337a Branch: refs/heads/feature/SLIDER-779_Move_to_Groovy_2.4.0 Commit: 8d0e337a0e7dc14ac1283808c9ebbd6772f9f4bc Parents: 5f5d8df Author: Gour Saha <[email protected]> Authored: Sun Feb 22 07:02:27 2015 -0800 Committer: Gour Saha <[email protected]> Committed: Sun Feb 22 07:02:27 2015 -0800 ---------------------------------------------------------------------- app-packages/storm/configuration/storm-env.xml | 1 + app-packages/storm/package/scripts/params.py | 3 +++ app-packages/storm/package/scripts/storm.py | 5 +++++ 3 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d0e337a/app-packages/storm/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm/configuration/storm-env.xml b/app-packages/storm/configuration/storm-env.xml index 091c08d..0c22a8d 100644 --- a/app-packages/storm/configuration/storm-env.xml +++ b/app-packages/storm/configuration/storm-env.xml @@ -60,6 +60,7 @@ export JAVA_HOME={{java_home}} # export STORM_CONF_DIR="" +export STORM_HOME={{app_root}} </value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d0e337a/app-packages/storm/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py index f6cccfb..8354617 100644 --- a/app-packages/storm/package/scripts/params.py +++ b/app-packages/storm/package/scripts/params.py @@ -62,3 +62,6 @@ if security_enabled: storm_jaas_stormclient_servicename = storm_jaas_server_principal.split("/")[0] storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab'] kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"]) + +metric_collector_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink*.jar" +storm_lib_dir = format("{app_root}/lib") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d0e337a/app-packages/storm/package/scripts/storm.py ---------------------------------------------------------------------- diff --git a/app-packages/storm/package/scripts/storm.py b/app-packages/storm/package/scripts/storm.py index 8ecb3a1..aeb4537 100644 --- a/app-packages/storm/package/scripts/storm.py +++ b/app-packages/storm/package/scripts/storm.py @@ -56,3 +56,8 @@ def storm(): group = params.user_group ) + if params.has_metric_collector: + Execute(format("ln -s {metric_collector_sink_jar} {storm_lib_dir}/ambari-metrics-storm-sink.jar"), + not_if=format("ls {storm_lib_dir}/ambari-metrics-storm-sink.jar"), + only_if=format("ls {metric_collector_sink_jar}") + )
