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/11/09 12:12:19 UTC

ambari git commit: AMBARI-13777 Ambari Metrics Collector fails to start if /tmp mounted with noexec (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk da8ca2ae3 -> 48ad32a20


AMBARI-13777 Ambari Metrics Collector fails to start if /tmp mounted with noexec (dsen)


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

Branch: refs/heads/trunk
Commit: 48ad32a2000e4e02fd915a53df4488685595e5cb
Parents: da8ca2a
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Nov 9 13:12:03 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Nov 9 13:12:03 2015 +0200

----------------------------------------------------------------------
 .../conf/unix/ambari-metrics-collector                   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad32a2/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 72d4460..b8d6602 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -92,6 +92,10 @@ function enable_normalization
     command="$command \n alter_async '$table', {NORMALIZATION_ENABLED => 'true'}"
   done
   echo -e ${command} | ${HBASE_CMD} --config ${HBASE_CONF_DIR} shell > /dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    echo "WARNING: Failed to enable Ambari Metrics data model normalization."
+     >&2 echo "WARNING: Failed to enable Ambari Metrics data model normalization."
+  fi
 }
 
 function hadoop_java_setup
@@ -224,11 +228,12 @@ function start()
     sleep 5
   done
   if [ $? -ne 0 ]; then
-    echo "Ambari Metrics data model initialization failed."
-    exit -1
+    echo "WARNING: Ambari Metrics data model initialization failed."
+     >&2 echo "WARNING: Ambari Metrics data model initialization failed."
+  else
+    enable_normalization
   fi
 
-  enable_normalization
   }
 
 function stop()