From 79676f15f4c63504d60ca9b7046cb7346e9c3df6 Mon Sep 17 00:00:00 2001
From: Nicolas Liochon <nkeywal@gmail.com>
Date: Fri, 11 Jul 2014 14:15:08 +0200
Subject: [PATCH] HBASE-11492 The servers do not honor the tcpNoDelay option

---
 .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 0cb002f6b3a..d6be4a8e15f 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,6 +30,7 @@ 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;
@@ -752,7 +753,7 @@ public class RpcServer implements RpcServerInterface {
       while ((channel = server.accept()) != null) {
         try {
           channel.configureBlocking(false);
-          channel.socket().setTcpNoDelay(tcpNoDelay);
+          channel.setOption(StandardSocketOptions.TCP_NODELAY, tcpNoDelay);
           channel.socket().setKeepAlive(tcpKeepAlive);
         } catch (IOException ioe) {
           channel.close();