HBASE-7285 HMaster fails to start with secure Hadoop

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1417690 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-12-05 23:13:30 +00:00
parent 39a0f56d47
commit 970b111774
1 changed files with 3 additions and 2 deletions

View File

@ -335,8 +335,6 @@ Server {
public HMaster(final Configuration conf) public HMaster(final Configuration conf)
throws IOException, KeeperException, InterruptedException { throws IOException, KeeperException, InterruptedException {
this.conf = new Configuration(conf); this.conf = new Configuration(conf);
LOG.info("hbase.rootdir=" + FSUtils.getRootDir(this.conf) +
", hbase.cluster.distributed=" + this.conf.getBoolean("hbase.cluster.distributed", false));
// Disable the block cache on the master // Disable the block cache on the master
this.conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f); this.conf.setFloat(HConstants.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.
@ -373,6 +371,9 @@ Server {
User.login(conf, "hbase.master.keytab.file", User.login(conf, "hbase.master.keytab.file",
"hbase.master.kerberos.principal", this.isa.getHostName()); "hbase.master.kerberos.principal", this.isa.getHostName());
LOG.info("hbase.rootdir=" + FSUtils.getRootDir(this.conf) +
", hbase.cluster.distributed=" + this.conf.getBoolean("hbase.cluster.distributed", false));
// set the thread name now we have an address // set the thread name now we have an address
setName(MASTER + "-" + this.serverName.toString()); setName(MASTER + "-" + this.serverName.toString());