You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:16:27 UTC
svn commit: r1181521 -
/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
Author: nspiegelberg
Date: Tue Oct 11 02:16:25 2011
New Revision: 1181521
URL: http://svn.apache.org/viewvc?rev=1181521&view=rev
Log:
revert liyin's change as per his request; he'll recommit using git/arc
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java?rev=1181521&r1=1181520&r2=1181521&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java Tue Oct 11 02:16:25 2011
@@ -79,7 +79,6 @@ public class HBaseClient {
protected final boolean tcpNoDelay; // if T then disable Nagle's Algorithm
protected final boolean tcpKeepAlive; // if T then use keepalives
protected int pingInterval; // how often sends ping to the server in msecs
- private final int connectionTimeOutMillSec; // the connection time out
protected final SocketFactory socketFactory; // how to create sockets
private int refCount = 1;
@@ -307,9 +306,8 @@ public class HBaseClient {
this.socket = socketFactory.createSocket();
this.socket.setTcpNoDelay(tcpNoDelay);
this.socket.setKeepAlive(tcpKeepAlive);
-
- NetUtils.connect(this.socket, remoteId.getAddress(),
- connectionTimeOutMillSec);
+ // connection time out is 20s
+ NetUtils.connect(this.socket, remoteId.getAddress(), 20000);
if (remoteId.rpcTimeout > 0) {
pingInterval = remoteId.rpcTimeout; // overwrite pingInterval
}
@@ -660,8 +658,6 @@ public class HBaseClient {
this.tcpNoDelay = conf.getBoolean("hbase.ipc.client.tcpnodelay", false);
this.tcpKeepAlive = conf.getBoolean("hbase.ipc.client.tcpkeepalive", true);
this.pingInterval = getPingInterval(conf);
- connectionTimeOutMillSec =
- conf.getInt("hbase.client.connection.timeout.millsec", 5000);
if (LOG.isDebugEnabled()) {
LOG.debug("The ping interval is" + this.pingInterval + "ms.");
}