Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4641 Block cache can be mistakenly instantiated on Master (jgray) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1190604 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Gray 2011-10-28 21:43:58 +00:00
parent b5929431a5
commit 9d172f9b96
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -419,6 +419,7 @@ Release 0.92.0 - Unreleased
HBASE-4692 HBASE-4300 broke the build HBASE-4692 HBASE-4300 broke the build
HBASE-4680 FSUtils.isInSafeMode() checks should operate on HBase root dir, HBASE-4680 FSUtils.isInSafeMode() checks should operate on HBase root dir,
where we have permissions where we have permissions
HBASE-4641 Block cache can be mistakenly instantiated on Master (jgray)
TESTS TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected HBASE-4450 test for number of blocks read: to serve as baseline for expected

5
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.executor.ExecutorService;
import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorType; 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.HBaseRPC;
import org.apache.hadoop.hbase.ipc.HBaseServer; import org.apache.hadoop.hbase.ipc.HBaseServer;
import org.apache.hadoop.hbase.ipc.HMasterInterface; import org.apache.hadoop.hbase.ipc.HMasterInterface;
@ -199,7 +200,9 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
*/ */
public HMaster(final Configuration conf) public HMaster(final Configuration conf)
throws IOException, KeeperException, InterruptedException { 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. // Set how many times to retry talking to another server over HConnection.
HConnectionManager.setServerSideHConnectionRetries(this.conf, LOG); HConnectionManager.setServerSideHConnectionRetries(this.conf, LOG);
// Server to handle client requests. // Server to handle client requests.