ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpapirkovs...@apache.org
Subject ambari git commit: AMBARI-9312. AMS status should be Critical if ams-hbase process goes down. Start fix. (mpapirkovskyy)
Date Fri, 23 Jan 2015 23:22:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk faa5b17b8 -> 2adcc744b


AMBARI-9312. AMS status should be Critical if ams-hbase process goes down. Start fix. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 2adcc744b91aeafd751e0fb7d7afd19bbec52654
Parents: faa5b17
Author: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Authored: Sat Jan 24 00:57:42 2015 +0200
Committer: Myroslav Papirkovskyy <mpapyrkovskyy@hortonworks.com>
Committed: Sat Jan 24 01:00:28 2015 +0200

----------------------------------------------------------------------
 .../conf/unix/ambari-metrics-collector                          | 2 +-
 .../common-services/AMS/0.1.0/package/scripts/ams_service.py    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2adcc744/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 93a1aef..4d6eed7 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector
@@ -218,7 +218,7 @@ case "$1" in
     daemon_status "${PIDFILE}"
     if [[ $? == 0  ]]; then
         echo "AMS is running as process $(cat "${PIDFILE}"). Exiting"
-        exit 1
+        exit 0
     else
         # stale pid file, so just remove it and continue on
         rm -f "${PIDFILE}" >/dev/null 2>&1

http://git-wip-us.apache.org/repos/asf/ambari/blob/2adcc744/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
index 9ebfa61..9260683 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
@@ -38,7 +38,9 @@ def ams_service(name, action):
   if name == 'collector':
     cmd = format("{ams_collector_script} --config {ams_collector_conf_dir}")
     pid_file = format("{ams_collector_pid_dir}/ambari-metrics-collector.pid")
-    no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}`
>/dev/null 2>&1")
+    #no_op_test should be much more complex to work with cumulative status of collector
+    #removing as startup script handle it also
+    #no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}`
>/dev/null 2>&1")
 
     if params.is_hbase_distributed:
       hbase_service('zookeeper', action=action)
@@ -49,7 +51,6 @@ def ams_service(name, action):
     if action == 'start':
       daemon_cmd = format("{cmd} start")
       Execute(daemon_cmd,
-              not_if=no_op_test,
               user=params.ams_user
       )
 


Mime
View raw message