You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/08/28 15:48:47 UTC
ambari git commit: AMBARI-12917 Changing python path in ams-env does
not affect psutil build (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 04d0eae4c -> a8786789f
AMBARI-12917 Changing python path in ams-env does not affect psutil build (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8786789
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8786789
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8786789
Branch: refs/heads/trunk
Commit: a8786789ff43a848dae2788a33d1bc577d49ca38
Parents: 04d0eae
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Aug 28 12:28:00 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Aug 28 16:48:33 2015 +0300
----------------------------------------------------------------------
.../conf/unix/ambari-metrics-monitor | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a8786789/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
index f927359..815b3e4 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/ambari-metrics-monitor
@@ -67,18 +67,6 @@ function write_pidfile
fi
}
-#TODO decide if rebuild on each start (pretty quickly) to tolerate major node changes (like kernel update)
-#build psutil
-if [ ! "$(ls -A ${RESOURCE_MONITORING_DIR}/psutil/build)" ]; then
- echo "Building psutil..."
- dir=$(pwd)
- cd "${RESOURCE_MONITORING_DIR}/psutil"
- ${PYTHON} "setup.py" "build"
- cd "${dir}"
-else
- echo "psutil build directory is not empty, continuing..."
-fi
-
#locate config dir
while [[ -z "${_ams_configs_done}" ]]; do
case $1 in
@@ -110,6 +98,18 @@ else
exit 1
fi
+#TODO decide if rebuild on each start (pretty quickly) to tolerate major node changes (like kernel update)
+#build psutil
+if [ ! "$(ls -A ${RESOURCE_MONITORING_DIR}/psutil/build)" ]; then
+ echo "Building psutil..."
+ dir=$(pwd)
+ cd "${RESOURCE_MONITORING_DIR}/psutil"
+ ${PYTHON} "setup.py" "build"
+ cd "${dir}"
+else
+ echo "psutil build directory is not empty, continuing..."
+fi
+
# Set log directory path
if [[ -n "${AMS_MONITOR_LOG_DIR}" ]]; then
OUTFILE=${AMS_MONITOR_LOG_DIR}/ambari-metrics-monitor.out