Github user rakeshadr commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/156#discussion_r97935895
--- Diff: src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java
---
@@ -68,4 +69,38 @@ public void testOperationsAfterCnxnClose() throws
IOException,
zk.close();
}
}
+
+ /**
+ * Mock extension of NIOServerCnxn to test for
+ * CancelledKeyException (ZOOKEEPER-2044).
+ */
+ private static class MockNIOServerCnxn extends NIOServerCnxn {
+ public MockNIOServerCnxn(NIOServerCnxn cnxn)
+ throws IOException {
+ super(cnxn.zkServer, cnxn.sock, cnxn.sk, cnxn.factory);
+ }
+
+ public void mockSendBuffer(ByteBuffer bb) throws Exception {
+ super.internalSendBuffer(bb);
+ }
+ }
+
+ @Test(timeout = 30000)
+ public void testValidSelectionKey() throws Exception {
+ final ZooKeeper zk = createClient();
+ try {
+ Iterable<ServerCnxn> connections =
serverFactory.getConnections();
+ for (ServerCnxn serverCnxn : connections) {
+ MockNIOServerCnxn mock = new
MockNIOServerCnxn((NIOServerCnxn) serverCnxn);
+ // Cancel key
+ ((NIOServerCnxn)
serverCnxn).sock.keyFor(((NIOServerCnxnFactory)
serverFactory).selector).cancel();;
+ mock.mockSendBuffer(ByteBuffer.allocate(8));
+ }
+ } catch (CancelledKeyException e) {
+ LOG.error("Exception while sending bytes!", e);
+ Assert.fail(e.toString());
+ } finally {
+ zk.close();
--- End diff --
Thanks @hanm , the latest changes looks good to me. I will leave this pull
request for one more day and if there is no more comments then will commit this
tomorrow.
I've an observation while running the unit test case, "zk.close()" call is
taking 15-20secs to complete. I think, this delay is due to the previously
submitted mocked buffer. Could you please run test in your env and let me know
your observation.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
