svn commit: r1232602 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet: manifests/cluster.pp modules/hadoop-hbase/manifests/init.pp modules/hadoop-hbase/templates/hbase-env.sh

[rv...@apache.org]

Author: rvs
Date: Tue Jan 17 21:54:55 2012
New Revision: 1232602

URL: http://svn.apache.org/viewvc?rev=1232602&view=rev
Log:
BIGTOP-351. Make HBASE_HEAPSIZE manageable via puppet (Patrick Taylor Ramsey via rvs)

Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/manifests/cluster.pp
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/manifests/cluster.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/manifests/cluster.pp?rev=1232602&r1=1232601&r2=1232602&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/manifests/cluster.pp (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/manifests/cluster.pp Tue Jan 17 21:54:55 2012
@@ -47,6 +47,7 @@ class hadoop_cluster_node {
   $hbase_relative_rootdir        = extlookup("hadoop_hbase_rootdir", "/hbase")
   $hadoop_hbase_rootdir = "hdfs://$hadoop_namenode_host:$hadoop_namenode_port/$hbase_relative_rootdir"
   $hadoop_hbase_zookeeper_quorum = $hadoop_head_node
+  $hbase_heap_size               = extlookup("hbase_heap_size", "1024")
 
   $hadoop_zookeeper_ensemble = ["$hadoop_head_node:2888:3888"]
 
@@ -92,6 +93,7 @@ class hadoop_worker_node inherits hadoop
 
   hadoop-hbase::server { "hbase region server":
         rootdir => $hadoop_hbase_rootdir,
+        heap_size => $hbase_heap_size,
         zookeeper_quorum => $hadoop_hbase_zookeeper_quorum,
         kerberos_realm => $kerberos_realm, 
   }
@@ -144,6 +146,7 @@ class hadoop_head_node inherits hadoop_c
 
   hadoop-hbase::master { "hbase master":
         rootdir => $hadoop_hbase_rootdir,
+        heap_size => $hbase_heap_size,
         zookeeper_quorum => $hadoop_hbase_zookeeper_quorum,
         kerberos_realm => $kerberos_realm, 
   }

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp?rev=1232602&r1=1232601&r2=1232602&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp Tue Jan 17 21:54:55 2012
@@ -37,7 +37,7 @@ class hadoop-hbase {
     include client-package
   }
 
-  define server($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
+  define server($rootdir, $zookeeper_quorum, $kerberos_realm = "", $heap_size="1024") {
     include common-server-config
 
     package { "hbase-regionserver":
@@ -53,7 +53,7 @@ class hadoop-hbase {
     } 
   }
 
-  define master($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
+  define master($rootdir, $zookeeper_quorum, $kerberos_realm = "", $heap_size="1024") {
     include common-server-config
 
     package { "hbase-master":

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh?rev=1232602&r1=1232601&r2=1232602&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh Tue Jan 17 21:54:55 2012
@@ -28,7 +28,7 @@
 export HBASE_CLASSPATH=/etc/hadoop/conf
 
 # The maximum amount of heap to use, in MB. Default is 1000.
-# export HBASE_HEAPSIZE=1000
+export HBASE_HEAPSIZE=<%= heap_size %>
 
 # Extra Java runtime options.
 # Below are what we set by default.  May only work with SUN JVM.