Repository: hbase Updated Branches: refs/heads/master c8461456d -> 0cd4cec5d
Revert "HBASE-17906 When a huge amount of data writing to hbase through thrift2, there will be a deadlock error. (Albert Lee)" Mistaken commit. This reverts commit 9dd5cda01747ffb91ac084792fa4a8670859e810. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0cd4cec5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0cd4cec5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0cd4cec5 Branch: refs/heads/master Commit: 0cd4cec5d24b5e7194a903e4d900f5558ed8b9a7 Parents: c846145 Author: Michael Stack <st...@apache.org> Authored: Fri Apr 14 12:07:40 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Fri Apr 14 12:07:40 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0cd4cec5/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 8f56b10..560ae64 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 @@ -432,6 +432,9 @@ public class ThriftServer extends Configured implements Tool { throw new RuntimeException("Could not parse the value provided for the port option", e); } + // Thrift's implementation uses '0' as a placeholder for 'use the default.' + int backlog = conf.getInt(BACKLOG_CONF_KEY, 0); + // Local hostname and user name, // used only if QOP is configured. String host = null;