leosunli commented on a change in pull request #1885:
URL: https://github.com/apache/hadoop/pull/1885#discussion_r427698174
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
##########
@@ -910,4 +912,94 @@ public void testRequestFileDescriptorsWhenULimit() throws
Exception {
}
}
}
+
+ @Test(timeout = 60000)
+ public void testDomainSocketClosedByDN() throws Exception {
+ TemporarySocketDirectory sockDir = new TemporarySocketDirectory();
+ Configuration conf =
+ createShortCircuitConf("testDomainSocketClosedByDN", sockDir);
+ MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+
+ try {
+ cluster.waitActive();
+ DistributedFileSystem fs = cluster.getFileSystem();
+ final ShortCircuitCache cache =
+ fs.getClient().getClientContext().getShortCircuitCache();
+ DomainPeer peer = getDomainPeerToDn(conf);
+ MutableBoolean usedPeer = new MutableBoolean(false);
+ ExtendedBlockId blockId = new ExtendedBlockId(123, "xyz");
+ final DatanodeInfo datanode = new DatanodeInfo.DatanodeInfoBuilder()
+ .setNodeID(cluster.getDataNodes().get(0).getDatanodeId()).build();
+ // Allocating the first shm slot requires using up a peer.
+ Slot slot1 = cache.allocShmSlot(datanode, peer, usedPeer, blockId,
+ "testReleaseSlotReuseDomainSocket_client");
+
+ cluster.getDataNodes().get(0).getShortCircuitRegistry()
+ .registerSlot(blockId, slot1.getSlotId(), false);
+
+ Slot slot2 = cache.allocShmSlot(datanode, peer, usedPeer, blockId,
+ "testReleaseSlotReuseDomainSocket_client");
+
+ cluster.getDataNodes().get(0).getShortCircuitRegistry()
+ .registerSlot(blockId, slot2.getSlotId(), false);
+
+ cache.scheduleSlotReleaser(slot1);
+
+ Thread.sleep(2000);
+ cache.scheduleSlotReleaser(slot2);
+ Thread.sleep(2000);
+ Assert.assertEquals(0,
+ cluster.getDataNodes().get(0).getShortCircuitRegistry().getShmNum());
+ Assert.assertEquals(0, cache.getDfsClientShmManager().getShmNum());
+ } finally {
+ cluster.shutdown();
+ }
+ }
+
+ @Test(timeout = 60000)
+ public void testDNRestart() throws Exception {
+ TemporarySocketDirectory sockDir = new TemporarySocketDirectory();
+ Configuration conf = createShortCircuitConf("testDNRestart", sockDir);
+ MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+ try {
+ cluster.waitActive();
+ DistributedFileSystem fs = cluster.getFileSystem();
+ final ShortCircuitCache cache =
+ fs.getClient().getClientContext().getShortCircuitCache();
+ DomainPeer peer = getDomainPeerToDn(conf);
+ MutableBoolean usedPeer = new MutableBoolean(false);
+ ExtendedBlockId blockId = new ExtendedBlockId(123, "xyz");
+ final DatanodeInfo datanode = new DatanodeInfo.DatanodeInfoBuilder()
+ .setNodeID(cluster.getDataNodes().get(0).getDatanodeId()).build();
+ // Allocating the first shm slot requires using up a peer.
+ Slot slot1 = cache.allocShmSlot(datanode, peer, usedPeer, blockId,
+ "testReleaseSlotReuseDomainSocket_client");
+
+ cluster.getDataNodes().get(0).getShortCircuitRegistry()
+ .registerSlot(blockId, slot1.getSlotId(), false);
+
+ // restart the datanode to invalidate the cache
+ cluster.restartDataNode(0);
+ Thread.sleep(1000);
+ // after the restart, new allocation and release should not be affect
+ cache.scheduleSlotReleaser(slot1);
+
+ Slot slot2 = null;
+ try {
+ slot2 = cache.allocShmSlot(datanode, peer, usedPeer, blockId,
+ "testReleaseSlotReuseDomainSocket_client");
+ } catch (ClosedChannelException ce) {
+
+ }
+ cache.scheduleSlotReleaser(slot2);
+ Thread.sleep(2000);
+ Assert.assertEquals(0, cluster.getDataNodes().get(0)
Review comment:
yeah, I really think so and update the patch.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
