Browse Source

Revert "AMBARI-13931. AMS should allow specification of custom classpath (Aravindan Vijayan via smohanty)"

This reverts commit 7c271fb8a5520438a7b3382850ad5ad8fb96e2c7.
Sumit Mohanty 9 years ago
parent
commit
137e665a67

+ 1 - 9
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml

@@ -31,14 +31,6 @@
     <value>/var/run/ambari-metrics-collector/</value>
     <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>
@@ -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

+ 0 - 1
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']