Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 518a7f4af3)
This commit is contained in:
Colin Patrick Mccabe 2014-10-27 17:44:07 -07:00
parent 0e05624618
commit 296c4064fc
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -93,6 +93,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

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
View File

@ -343,6 +343,7 @@ public class TestBlockReaderFactory {
} }
}); });
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**
@ -378,6 +379,7 @@ public class TestBlockReaderFactory {
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 class TestBlockReaderFactory {
Assert.assertTrue(cache.getDfsClientShmManager(). Assert.assertTrue(cache.getDfsClientShmManager().
getDomainSocketWatcher().isClosed()); getDomainSocketWatcher().isClosed());
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
View File

@ -519,6 +519,7 @@ public class TestShortCircuitCache {
} }
}); });
cluster.shutdown(); cluster.shutdown();
sockDir.close();
} }
/** /**