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

[vi...@apache.org]

Author: vikram
Date: Thu Jun  7 01:50:00 2012
New Revision: 1347285

URL: http://svn.apache.org/viewvc?rev=1347285&view=rev
Log:
AMBARI-467. Fix hive stop to escape $. (Contributed by Mahadev)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/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=1347285&r1=1347284&r2=1347285&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 01:50:00 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-467. Fix hive stop to escape $. (Mahadev via Vikram)
+
   AMBARI-446. Support Resume For Manage Services (Varun via Vikram)
   
   AMBARI-466. Add nodes page alerts removed in case of adding duplicate nodes (Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/service.pp?rev=1347285&r1=1347284&r2=1347285&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/service.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/service.pp Thu Jun  7 01:50:00 2012
@@ -15,7 +15,7 @@ class hdp-hive::service(
     $no_op_test = "ls ${pid_file} >/dev/null 2>&1 && ps `cat ${pid_file}` >/dev/null 2>&1"
   } elsif ($ensure == 'stopped') {
     #TODO: this needs to be fixed
-    $daemon_cmd = "ps aux | awk '{print $1,$2}' | grep ${user} | awk '{print $2}' | xargs kill >/dev/null 2>&1"
+    $daemon_cmd = "ps aux | awk '{print \$1,\$2}' | grep ${user} | awk '{print \$2}' | xargs kill >/dev/null 2>&1"
     $no_op_test = "ps aux | grep -i [h]ive"
   } else {
     $daemon_cmd = undef