Repository: ambari Updated Branches: refs/heads/trunk 53922274b -> 00eccc6e5
AMBARI-9710 API taking long time to respond (causes UI to load very slowly) (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00eccc6e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00eccc6e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00eccc6e Branch: refs/heads/trunk Commit: 00eccc6e5adb71c87985184f09326dd1a2c7df4c Parents: ca273f7 Author: Dmytro Sen <d...@apache.org> Authored: Thu Feb 19 18:25:29 2015 +0200 Committer: Dmytro Sen <d...@apache.org> Committed: Thu Feb 19 18:50:57 2015 +0200 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 3 +-- .../AMBARI_METRICS/0.1.0/package/scripts/params.py | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/00eccc6e/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 46a1221..cf37216 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 @@ -125,10 +125,9 @@ export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Djava.security.auth.login.co # use embedded native libs _HADOOP_NATIVE_LIB="/usr/lib/ams-hbase/lib/hadoop-native/" -{% if disable_hadoop_environment %} +export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}" # Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/ export HADOOP_HOME=`pwd` -{% endif %} </value> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/00eccc6e/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 c60833e..17ca4d2 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 @@ -66,8 +66,6 @@ is_hbase_distributed = hbase_root_dir.startswith('hdfs://') # security is disabled for embedded mode, when HBase is backed by file security_enabled = False if not is_hbase_distributed else config['configurations']['cluster-env']['security_enabled'] -# if cluster is secured and embedded we have to disable haddop env -disable_hadoop_environment = config['configurations']['cluster-env']['security_enabled'] and not is_hbase_distributed # this is "hadoop-metrics.properties" for 1.x stacks metric_prop_file_name = "hadoop-metrics2-hbase.properties" @@ -86,7 +84,6 @@ regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, regionserver_xm hbase_heapsize = master_heapsize zookeeper_quorum_hosts = ','.join(ams_collector_hosts) if is_hbase_distributed else 'localhost' -hbase_cluster_distributed = 'true' if is_hbase_distributed else 'false' ams_checkpoint_dir = config['configurations']['ams-site']['timeline.metrics.aggregator.checkpoint.dir'] hbase_pid_dir = status_params.hbase_pid_dir
