You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2014/07/11 18:44:15 UTC
git commit: Revert "HBASE-11492 The servers do not honor the
tcpNoDelay option"
Repository: hbase
Updated Branches:
refs/heads/branch-1 c80b45104 -> daa16b9c4
Revert "HBASE-11492 The servers do not honor the tcpNoDelay option"
This reverts commit c80b4510443552d13f21f5eda62f94daff318565.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/daa16b9c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/daa16b9c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/daa16b9c
Branch: refs/heads/branch-1
Commit: daa16b9c4d9c93cd4458c30fd97328af856b5f0d
Parents: c80b451
Author: Nicolas Liochon <nk...@gmail.com>
Authored: Fri Jul 11 18:43:46 2014 +0200
Committer: Nicolas Liochon <nk...@gmail.com>
Committed: Fri Jul 11 18:43:46 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/daa16b9c/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index d6be4a8..0cb002f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -30,7 +30,6 @@ import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
-import java.net.StandardSocketOptions;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.nio.channels.CancelledKeyException;
@@ -753,7 +752,7 @@ public class RpcServer implements RpcServerInterface {
while ((channel = server.accept()) != null) {
try {
channel.configureBlocking(false);
- channel.setOption(StandardSocketOptions.TCP_NODELAY, tcpNoDelay);
+ channel.socket().setTcpNoDelay(tcpNoDelay);
channel.socket().setKeepAlive(tcpKeepAlive);
} catch (IOException ioe) {
channel.close();