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-21839 METRICS_MONITOR start is failing due to "ImportError: cannot import name _common" (dsen)
Date Thu, 31 Aug 2017 09:49:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 fe9cfaa93 -> c0b794467


AMBARI-21839 METRICS_MONITOR start is failing due to "ImportError: cannot import name _common"
(dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0b79446
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0b79446
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0b79446

Branch: refs/heads/branch-2.6
Commit: c0b794467afc1bed53c29f1cc6c3b763ed6978c5
Parents: fe9cfaa
Author: Dmytro Sen <dsen@apache.org>
Authored: Thu Aug 31 12:31:43 2017 +0300
Committer: Dmytro Sen <dsen@apache.org>
Committed: Thu Aug 31 12:49:53 2017 +0300

----------------------------------------------------------------------
 .../conf/unix/ambari-metrics-monitor                 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c0b79446/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 967e133..fb3d154 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
@@ -98,23 +98,26 @@ else
   exit 1
 fi
 
+# Set log directory path
+if [[ -n "${AMS_MONITOR_LOG_DIR}" ]]; then
+  OUTFILE=${AMS_MONITOR_LOG_DIR}/ambari-metrics-monitor.out
+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"
+  # build psutil and redirect output to log file
+  echo "--------------------------Building psutil--------------------------" >> ${OUTFILE}
+  ${PYTHON} "setup.py" "build" >> ${OUTFILE}
+  echo "----------------------Finished building psutil---------------------" >> ${OUTFILE}
   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
-fi
-
 # Set pid directory path
 if [[ -n "${AMS_MONITOR_PID_DIR}" ]]; then
   PIDFILE=${AMS_MONITOR_PID_DIR}/ambari-metrics-monitor.pid


Mime
View raw message