svn commit: r1417690 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[st...@apache.org]

Author: stack
Date: Wed Dec  5 23:13:30 2012
New Revision: 1417690

URL: http://svn.apache.org/viewvc?rev=1417690&view=rev
Log:
HBASE-7285 HMaster fails to start with secure Hadoop

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1417690&r1=1417689&r2=1417690&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed Dec  5 23:13:30 2012
@@ -335,8 +335,6 @@ Server {
   public HMaster(final Configuration conf)
   throws IOException, KeeperException, InterruptedException {
     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
     this.conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);
     // Set how many times to retry talking to another server over HConnection.
@@ -373,6 +371,9 @@ Server {
     User.login(conf, "hbase.master.keytab.file",
       "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
     setName(MASTER + "-" + this.serverName.toString());