From 9726c71681c0b8b22e83b056102803646b8d50c2 Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Tue, 21 Mar 2017 08:06:56 -0700
Subject: [PATCH] HBASE-17798 RpcServer.Listener.Reader can abort due to
 CancelledKeyException (Guangxu Cheng)

---
 .../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 871ea65de62..b5cd3e28693 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
@@ -721,7 +721,8 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
             }
           } catch (InterruptedException e) {
             LOG.debug("Interrupted while sleeping");
-            return;
+          } catch (CancelledKeyException e) {
+            LOG.error(getName() + ": CancelledKeyException in Reader", e);
           } catch (IOException ex) {
             LOG.info(getName() + ": IOException in Reader", ex);
           }