ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-12917 Changing python path in ams-env does not affect psutil build (dsen)
Date Fri, 28 Aug 2015 13:50:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 0731e999d -> ea10b0f51


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/ea10b0f5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea10b0f5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea10b0f5

Branch: refs/heads/branch-2.1
Commit: ea10b0f51447a36a0c4aabc2ff467a057475d7fe
Parents: 0731e99
Author: Dmytro Sen <dsen@apache.org>
Authored: Fri Aug 28 16:48:33 2015 +0300
Committer: Dmytro Sen <dsen@apache.org>
Committed: Fri Aug 28 16:50:02 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/ea10b0f5/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


Mime
View raw message