Merge pull request #1277 from vt0r/disable_bucketcache_masters

Disable bucket cache on HBase masters

Author: cbaenziger

cookbooks/bcpc-hadoop/recipes/hbase_config.rb

@@ -134,7 +134,12 @@
 # If HBASE bucket cache is enabled the properties from this section will be included in hbase-site.xml
 #
 bucketcache_size = (node['bcpc']['hadoop']['hbase_rs']['mx_dir_mem']['size'] - node['bcpc']['hadoop']['hbase_rs']['hdfs_dir_mem']['size']).floor
-if node['bcpc']['hadoop']['hbase']['bucketcache']['enabled'] == true
+bucketcache_enabled = node['bcpc']['hadoop']['hbase']['bucketcache']['enabled']
+is_region_server = node['bcpc']['hadoop']['rs_hosts'].any? do |rs|
+  rs.values[0] == node['fqdn']
+end
+
+if bucketcache_enabled && is_region_server
   generated_values['hbase.regionserver.global.memstore.upperLimit'] = node['bcpc']['hadoop']['hbase_rs']['memstore']['upperlimit'].to_s
   generated_values['hfile.block.cache.size'] = node['bcpc']['hadoop']['hbase']['blockcache']['size'].to_s
   generated_values['hbase.bucketcache.size'] = bucketcache_size

cookbooks/bcpc-hadoop/recipes/hbase_env.rb

@@ -63,10 +63,6 @@
   node.default['bcpc']['hadoop']['hbase']['env']['HBASE_REGIONSERVER_OPTS'] =
     node['bcpc']['hadoop']['hbase']['env']['HBASE_REGIONSERVER_OPTS'] +
     ' -XX:MaxDirectMemorySize=' + node['bcpc']['hadoop']['hbase_rs']['mx_dir_mem']['size'].to_s + 'm'
-
-  node.default['bcpc']['hadoop']['hbase']['env']['HBASE_MASTER_OPTS'] =
-    node['bcpc']['hadoop']['hbase']['env']['HBASE_MASTER_OPTS'] +
-    ' -XX:MaxDirectMemorySize=' + node['bcpc']['hadoop']['hbase_master']['mx_dir_mem']['size'].to_s + 'm'
 end
 
 if node[:bcpc][:hadoop][:kerberos][:enable] == true