HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC (Jinghui Wang via Colin P. McCabe)

This commit is contained in:
Colin Patrick Mccabe 2014-10-27 17:44:07 -07:00
parent 00b4e44a2e
commit 518a7f4af3
3 changed files with 8 additions and 0 deletions

View File

@ -349,6 +349,10 @@ Release 2.7.0 - UNRELEASED
HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG
level instead of INFO level. (Xiaoyu Yao via wheat9) level instead of INFO level. (Xiaoyu Yao via wheat9)
HDFS-7282. Fix intermittent TestShortCircuitCache and
TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC.
(Jinghui Wang via Colin Patrick McCabe)
Release 2.6.0 - UNRELEASED Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -343,6 +343,7 @@ public void visit(HashMap<DatanodeInfo, PerDatanodeVisitorInfo> info)
} }
}); });
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**
@ -378,6 +379,7 @@ public void testShortCircuitReadFromClientWithoutShm() throws Exception {
fs.dfs.getClientContext().getShortCircuitCache(); fs.dfs.getClientContext().getShortCircuitCache();
Assert.assertEquals(null, cache.getDfsClientShmManager()); Assert.assertEquals(null, cache.getDfsClientShmManager());
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**
@ -411,6 +413,7 @@ public void testShortCircuitCacheShutdown() throws Exception {
Assert.assertTrue(cache.getDfsClientShmManager(). Assert.assertTrue(cache.getDfsClientShmManager().
getDomainSocketWatcher().isClosed()); getDomainSocketWatcher().isClosed());
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**

View File

@ -519,6 +519,7 @@ public void visit(int numOutstandingMmaps,
} }
}); });
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**