From 7425483bd87fe6142571dbf8739a5ba7c9f3507b Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Fri, 26 Sep 2014 15:39:46 -0700 Subject: [PATCH 1/2] KAFKA-1577. Exception in ConnectionQuotas while shutting down. added selector operation to refresh selector.keys. --- core/src/main/scala/kafka/network/SocketServer.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala index 3a6f8d1..7ca79d5 100644 --- a/core/src/main/scala/kafka/network/SocketServer.scala +++ b/core/src/main/scala/kafka/network/SocketServer.scala @@ -172,6 +172,8 @@ private[kafka] abstract class AbstractServerThread(connectionQuotas: ConnectionQ * Close all open connections */ def closeAll() { + // removes cancelled keys from selector.keys set + this.selector.selectNow() val iter = this.selector.keys().iterator() while (iter.hasNext) { val key = iter.next() -- 1.8.5.2 (Apple Git-48) From c6f290e28986c01c8d569474f6632dc702c83602 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Fri, 26 Sep 2014 19:10:48 -0700 Subject: [PATCH 2/2] KAFKA-1577. Exception in ConnectionQuotas while shutting down. Removed swalloError for closeAll. --- core/src/main/scala/kafka/network/SocketServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala index 7ca79d5..cee76b3 100644 --- a/core/src/main/scala/kafka/network/SocketServer.scala +++ b/core/src/main/scala/kafka/network/SocketServer.scala @@ -361,7 +361,7 @@ private[kafka] class Processor(val id: Int, maybeCloseOldestConnection } debug("Closing selector.") - swallowError(closeAll()) + closeAll() swallowError(selector.close()) shutdownComplete() } -- 1.8.5.2 (Apple Git-48)