You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/12/30 17:32:17 UTC
hbase git commit: HBASE-12781 thrift2 listen port will bind always to
the passed command line address (Pankaj Kumar)
Repository: hbase
Updated Branches:
refs/heads/master 0513a21dc -> 7310fa2ba
HBASE-12781 thrift2 listen port will bind always to the passed command line address (Pankaj Kumar)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7310fa2b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7310fa2b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7310fa2b
Branch: refs/heads/master
Commit: 7310fa2ba7cc8546ee5d6638539457850f60eeab
Parents: 0513a21
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 30 08:32:12 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 30 08:32:12 2014 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/thrift2/ThriftServer.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7310fa2b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
index 60f4763..72e9117 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
@@ -309,6 +309,15 @@ public class ThriftServer {
System.exit(1);
}
+ // Get address to bind
+ String bindAddress;
+ if (cmd.hasOption("bind")) {
+ bindAddress = cmd.getOptionValue("bind");
+ conf.set("hbase.thrift.info.bindAddress", bindAddress);
+ } else {
+ bindAddress = conf.get("hbase.thrift.info.bindAddress");
+ }
+
// Get port to bind to
int listenPort = 0;
try {
@@ -387,7 +396,7 @@ public class ThriftServer {
conf.getBoolean("hbase.regionserver.thrift.framed", false) || nonblocking || hsha;
TTransportFactory transportFactory = getTTransportFactory(qop, name, host, framed,
conf.getInt("hbase.regionserver.thrift.framed.max_frame_size_in_mb", 2) * 1024 * 1024);
- InetSocketAddress inetSocketAddress = bindToPort(cmd.getOptionValue("bind"), listenPort);
+ InetSocketAddress inetSocketAddress = bindToPort(bindAddress, listenPort);
conf.setBoolean("hbase.regionserver.thrift.framed", framed);
if (qop != null) {
// Create a processor wrapper, to get the caller