You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 00:52:35 UTC

svn commit: r1347194 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/puppet/modules/hdp-zookeeper/manifests/service.pp

Author: vikram
Date: Wed Jun  6 22:52:35 2012
New Revision: 1347194

URL: http://svn.apache.org/viewvc?rev=1347194&view=rev
Log:
AMBARI-406. Monitoring dashboard does not show ZK service state correctly (Contributed by Ramya)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-zookeeper/manifests/service.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347194&r1=1347193&r2=1347194&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun  6 22:52:35 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-406. Monitoring dashboard does not show ZK service state correctly (Ramya via Vikram)
+
   AMBARI-321. Multiple ZK nodes not displayed on review-page (Yusaku via Vikram)
 
   AMBARI-405. Clean up messages for service management reconfiguration popup (Yusaku via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-zookeeper/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-zookeeper/manifests/service.pp?rev=1347194&r1=1347193&r2=1347194&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-zookeeper/manifests/service.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-zookeeper/manifests/service.pp Wed Jun  6 22:52:35 2012
@@ -16,7 +16,7 @@ class hdp-zookeeper::service(
     $no_op_test = "ls ${pid_file} >/dev/null 2>&1 && ps `cat ${pid_file}` >/dev/null 2>&1"
     #not using $no_op_test = "su - ${user} -c  '${cmd} status'" because checks more than whether there is a service started up
   } elsif ($ensure == 'stopped') {
-    $daemon_cmd = "su - ${user} -c  '${cmd} stop'"
+    $daemon_cmd = "su - ${user} -c  'source ${conf_dir}/zookeeper-env.sh ; ${cmd} stop'"
     #TODO: put in no_op_test for stopped
     $no_op_test = undef
   } else {