svn commit: r1483454 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp

[sm...@apache.org]

Author: smohanty
Date: Thu May 16 17:15:11 2013
New Revision: 1483454

URL: http://svn.apache.org/r1483454
Log:
AMBARI-2141. When hbase user is changed hbase does not start properly after upgrade. (smohanty)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1483454&r1=1483453&r2=1483454&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 16 17:15:11 2013
@@ -856,6 +856,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2141. When hbase user is changed hbase does not start properly
+ after upgrade. (smohanty)
+
  AMBARI-2142. Unecessary use of @Transactional on all DAO methods. (swagle)
 
  AMBARI-2107. Cluster CPU Chart is off the charts. Reopened. (swagle)

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp?rev=1483454&r1=1483453&r2=1483454&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp Thu May 16 17:15:11 2013
@@ -64,13 +64,14 @@ define hdp-hbase::service(
     }
   }
 
-  anchor{"hdp-hbase::service::${name}::begin":} -> Hdp::Directory_recursive_create<|tag == $tag|> -> anchor{"hdp-hbase::service::${name}::end":}
   if ($daemon_cmd != undef) { 
     hdp::exec { $daemon_cmd:
       command      => $daemon_cmd,
       unless       => $no_op_test,
       initial_wait => $initial_wait
     }
-    Hdp::Directory_recursive_create<|context_tag == 'hbase_service'|> -> Hdp::Exec[$daemon_cmd] -> Anchor["hdp-hbase::service::${name}::end"]
+    anchor{"hdp-hbase::service::${name}::begin":} -> Hdp::Directory_recursive_create<|tag == $tag|> -> Hdp::Exec[$daemon_cmd] -> anchor{"hdp-hbase::service::${name}::end":}
+  } else {
+    anchor{"hdp-hbase::service::${name}::begin":} -> Hdp::Directory_recursive_create<|tag == $tag|> -> anchor{"hdp-hbase::service::${name}::end":}  
   }
 }