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

HBASE-8695 The HBase thrift service ignores XML configuration 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1502158 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lars George 2013-07-11 08:57:34 +00:00
parent b33d113a64
commit 68a5420e09
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
View File

@ -91,7 +91,7 @@ public class ThriftServer {
*/
void doMain(final String[] args) throws Exception {
processOptions(args);
// login the server principal (if using secure Hadoop)
if (User.isSecurityEnabled() && User.isHBaseSecurityEnabled(conf)) {
String machineName = Strings.domainNamePointerToHostName(
@ -100,7 +100,7 @@ public class ThriftServer {
User.login(conf, "hbase.thrift.keytab.file",
"hbase.thrift.kerberos.principal", machineName);
}
serverRunner = new ThriftServerRunner(conf);
// Put up info server.
@ -197,10 +197,12 @@ public class ThriftServer {
conf, TBoundedThreadPoolServer.THREAD_KEEP_ALIVE_TIME_SEC_CONF_KEY);
// Set general thrift server options
conf.setBoolean(
ThriftServerRunner.COMPACT_CONF_KEY, cmd.hasOption(COMPACT_OPTION));
conf.setBoolean(
ThriftServerRunner.FRAMED_CONF_KEY, cmd.hasOption(FRAMED_OPTION));
boolean compact = cmd.hasOption(COMPACT_OPTION) ||
conf.getBoolean(ThriftServerRunner.COMPACT_CONF_KEY, false);
conf.setBoolean(ThriftServerRunner.COMPACT_CONF_KEY, compact);
boolean framed = cmd.hasOption(FRAMED_OPTION) ||
conf.getBoolean(ThriftServerRunner.FRAMED_CONF_KEY, false);
conf.setBoolean(ThriftServerRunner.FRAMED_CONF_KEY, framed);
if (cmd.hasOption(BIND_OPTION)) {
conf.set(
ThriftServerRunner.BIND_CONF_KEY, cmd.getOptionValue(BIND_OPTION));