You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/12 21:00:33 UTC
ambari git commit: AMBARI-12741 - AMS Collector process takes way
more Virtual memory than Xmx setting
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fb6a5d633 -> bc32ce12d
AMBARI-12741 - AMS Collector process takes way more Virtual memory than Xmx setting
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc32ce12
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc32ce12
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc32ce12
Branch: refs/heads/branch-2.1
Commit: bc32ce12d87123682551268cdbb402be9a8e643d
Parents: fb6a5d6
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Wed Aug 12 21:52:50 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Wed Aug 12 21:52:50 2015 +0300
----------------------------------------------------------------------
.../conf/unix/ambari-metrics-collector | 2 +-
.../common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc32ce12/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index 0ee70a2..bdf00b5 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -176,7 +176,7 @@ function start()
rm -f "${PIDFILE}" >/dev/null 2>&1
fi
- nohup "${JAVA}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "${AMS_COLLECTOR_OPTS}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+ nohup "${JAVA}" "-Xmx$AMS_COLLECTOR_HEAPSIZE" "${AMS_COLLECTOR_OPTS}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
PID=$!
write_pidfile "${PIDFILE}"
sleep 2
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc32ce12/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index af4d9c9..e84193c 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -77,7 +77,7 @@ export AMS_HBASE_PID_DIR={{hbase_pid_dir}}
export AMS_COLLECTOR_HEAPSIZE={{metrics_collector_heapsize}}
# AMS Collector options
-export AMS_COLLECTOR_OPTS="-Djava.library.path=/usr/lib/ams-hbase/lib/hadoop-native -Xmx$AMS_COLLECTOR_HEAPSIZE "
+export AMS_COLLECTOR_OPTS="-Djava.library.path=/usr/lib/ams-hbase/lib/hadoop-native"
{% if security_enabled %}
export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS -Djava.security.auth.login.config={{ams_collector_jaas_config_file}} -Dzookeeper.sasl.client.username={{zk_servicename}}"
{% endif %}