This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new c0f228b AMBARI-25821: Fixed syntax error that caused OOM in the
ambari-metric-collector (#88)
c0f228b is described below
commit c0f228bbb0bcbfce115f4f0105e877cf36b9e4f8
Author: Yu Hou <524860...@qq.com>
AuthorDate: Thu Dec 22 22:40:23 2022 +0800
AMBARI-25821: Fixed syntax error that caused OOM in the
ambari-metric-collector (#88)
---
ambari-metrics-host-monitoring/src/main/python/core/emitter.py | 2 +-
ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py | 2 +-
ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
b/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
index df79d69..4c0dd96 100644
--- a/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
+++ b/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
@@ -115,7 +115,7 @@ class Emitter(threading.Thread):
if not success:
logger.info('No valid collectors found...')
for collector_host in self.active_collector_hosts:
- success = self.try_with_collector(self.collector_protocol,
collector_host, self.ollector_port, data)
+ success = self.try_with_collector(self.collector_protocol,
collector_host, self.collector_port, data)
if success:
break
pass
diff --git
a/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
b/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
index 375d654..ba77be6 100644
--- a/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
+++ b/ambari-metrics-host-monitoring/src/main/python/core/stop_handler.py
@@ -85,7 +85,7 @@ def bind_signal_handlers(new_handler=None):
if new_handler is None:
global _handler
- _handler = StopHandler()
+ _handler = StopHandlerLinux()
else:
_handler = new_handler
return _handler
diff --git a/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
b/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
index ba3d650..fe4bace 100644
--- a/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -261,7 +261,7 @@ function start()
rm -f "${PIDFILE}" >/dev/null 2>&1
fi
- nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE"
${AMS_COLLECTOR_OPTS} "-cp"
"/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}:${COLLECTOR_ADDITIONAL_CLASSPATH}"
"-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}"
"-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+ nohup "${JAVA}" "-Xms$AMS_COLLECTOR_HEAPSIZE" "-Xmx$AMS_COLLECTOR_HEAPSIZE"
${AMS_COLLECTOR_OPTS} "-cp"
"${COLLECTOR_CONF_DIR}:/usr/lib/ambari-metrics-collector/*:${COLLECTOR_ADDITIONAL_CLASSPATH}"
"-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}"
"-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
PID=$!
write_pidfile "${PIDFILE}"
sleep 2
@@ -330,7 +330,7 @@ function start_upgrade()
#get rid of the first command argument and pass the rest to java
shift
- nohup "${JAVA}" "-cp"
"/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}:${COLLECTOR_ADDITIONAL_CLASSPATH}"
"-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dams.log.file=${UPGRADE_LOGFILE}"
"${CLASS}" "${AMS_COLLECTOR_LOG_DIR}/ambari-metrics-migration-state.txt" "$@" >
$OUTFILE 2>&1 &
+ nohup "${JAVA}" "-cp"
"${COLLECTOR_CONF_DIR}:/usr/lib/ambari-metrics-collector/*:${COLLECTOR_ADDITIONAL_CLASSPATH}"
"-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dams.log.file=${UPGRADE_LOGFILE}"
"${CLASS}" "${AMS_COLLECTOR_LOG_DIR}/ambari-metrics-migration-state.txt" "$@" >
$OUTFILE 2>&1 &
PID=$!
write_pidfile "${UPGRADE_PIDFILE}"
sleep 1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
