Revert "AMBARI-13931. AMS should allow specification of custom classpath (Aravindan Vijayan via smohanty)"
This reverts commit 7c271fb8a5520438a7b3382850ad5ad8fb96e2c7. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/137e665a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/137e665a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/137e665a Branch: refs/heads/branch-dev-patch-upgrade Commit: 137e665a67a46ad0bd85cde8c501594c5e30fa4e Parents: 7c271fb Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Tue Nov 17 17:41:56 2015 -0800 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Tue Nov 17 17:41:56 2015 -0800 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 10 +--------- .../AMBARI_METRICS/0.1.0/package/scripts/params.py | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/137e665a/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 c8f8ad6..b3f8dd1 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,14 +32,6 @@ <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> @@ -151,7 +143,7 @@ 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}:{{hbase_classpath_additional}} +export HBASE_CLASSPATH=${HBASE_CLASSPATH} # 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/137e665a/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 b6f6e40..568b11d 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,7 +92,6 @@ 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 = config['configurations']['ams-hbase-env']['hbase_classpath_additional'] master_heapsize = config['configurations']['ams-hbase-env']['hbase_master_heapsize'] regionserver_heapsize = config['configurations']['ams-hbase-env']['hbase_regionserver_heapsize']