svn commit: r1190604 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[jg...@apache.org]

Author: jgray
Date: Fri Oct 28 21:43:58 2011
New Revision: 1190604

URL: http://svn.apache.org/viewvc?rev=1190604&view=rev
Log:
HBASE-4641  Block cache can be mistakenly instantiated on Master (jgray)

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1190604&r1=1190603&r2=1190604&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Oct 28 21:43:58 2011
@@ -419,6 +419,7 @@ Release 0.92.0 - Unreleased
    HBASE-4692  HBASE-4300 broke the build
    HBASE-4680  FSUtils.isInSafeMode() checks should operate on HBase root dir,
                where we have permissions
+   HBASE-4641  Block cache can be mistakenly instantiated on Master (jgray)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1190604&r1=1190603&r2=1190604&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Fri Oct 28 21:43:58 2011
@@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.client.Re
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.executor.ExecutorService;
 import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorType;
+import org.apache.hadoop.hbase.io.hfile.CacheConfig;
 import org.apache.hadoop.hbase.ipc.HBaseRPC;
 import org.apache.hadoop.hbase.ipc.HBaseServer;
 import org.apache.hadoop.hbase.ipc.HMasterInterface;
@@ -199,7 +200,9 @@ implements HMasterInterface, HMasterRegi
    */
   public HMaster(final Configuration conf)
   throws IOException, KeeperException, InterruptedException {
-    this.conf = conf;
+    this.conf = new Configuration(conf);
+    // Disable the block cache on the master
+    this.conf.setFloat(CacheConfig.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);
     // Set how many times to retry talking to another server over HConnection.
     HConnectionManager.setServerSideHConnectionRetries(this.conf, LOG);
     // Server to handle client requests.