You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/11/18 21:50:33 UTC
ambari git commit: AMBBARi-13931. AMS should allow specification of
custom classpath. (Aravindan Vijayan via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 d01b1d806 -> a793c3250
AMBBARi-13931. AMS should allow specification of custom classpath. (Aravindan Vijayan via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a793c325
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a793c325
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a793c325
Branch: refs/heads/branch-2.1
Commit: a793c3250ee71f2bdde1ee9253e26ccd7c033e38
Parents: d01b1d8
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Nov 18 12:50:22 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Nov 18 12:50:22 2015 -0800
----------------------------------------------------------------------
.../0.1.0/configuration/ams-hbase-env.xml | 16 +++++++++++++++-
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 1 +
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a793c325/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index b3f8dd1..367dc00 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -32,6 +32,14 @@
<description>Pid Directory for HBase.</description>
</property>
<property>
+ <name>hbase_classpath_additional</name>
+ <value></value>
+ <description>Additional directory or jar in classpath for HBase.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
+ </property>
+ <property>
<name>hbase_regionserver_heapsize</name>
<value>512</value>
<description>
@@ -143,7 +151,13 @@ export JAVA_HOME={{java64_home}}
export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}
# Extra Java CLASSPATH elements. Optional.
-export HBASE_CLASSPATH=${HBASE_CLASSPATH}
+additional_cp={{hbase_classpath_additional}}
+if [ -n "$additional_cp" ];
+then
+ export HBASE_CLASSPATH=${HBASE_CLASSPATH}:$additional_cp
+else
+ export HBASE_CLASSPATH=${HBASE_CLASSPATH}
+fi
# The maximum amount of heap to use, in MB. Default is 1000.
export HBASE_HEAPSIZE={{hbase_heapsize}}m
http://git-wip-us.apache.org/repos/asf/ambari/blob/a793c325/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 568b11d..eb2993f 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -92,6 +92,7 @@ metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sin
metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_log_dir']
+hbase_classpath_additional = default("/configurations/ams-hbase-env/hbase_classpath_additional", None)
master_heapsize = config['configurations']['ams-hbase-env']['hbase_master_heapsize']
regionserver_heapsize = config['configurations']['ams-hbase-env']['hbase_regionserver_heapsize']