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

HDFS-5103. Merging change r1514576 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514577 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-08-16 04:43:00 +00:00
parent ce6ba40569
commit 1f0d7631d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,8 @@ Release 2.1.1-beta - UNRELEASED
HDFS-5100. TestNamenodeRetryCache fails on Windows due to incorrect cleanup. HDFS-5100. TestNamenodeRetryCache fails on Windows due to incorrect cleanup.
(Chuan Liu via cnauroth) (Chuan Liu via cnauroth)
HDFS-5103. TestDirectoryScanner fails on Windows. (Chuan Liu via cnauroth)
Release 2.1.0-beta - 2013-08-22 Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
View File

@ -394,12 +394,12 @@ public long getAvailable() throws IOException {
@Override @Override
public String getBasePath() { public String getBasePath() {
return "/base"; return (new File("/base")).getAbsolutePath();
} }
@Override @Override
public String getPath(String bpid) throws IOException { public String getPath(String bpid) throws IOException {
return "/base/current/" + bpid; return (new File("/base/current/" + bpid)).getAbsolutePath();
} }
@Override @Override
@ -416,8 +416,6 @@ public File getFinalizedDir(String bpid) throws IOException {
void testScanInfoObject(long blockId, File blockFile, File metaFile) void testScanInfoObject(long blockId, File blockFile, File metaFile)
throws Exception { throws Exception {
assertEquals("/base/current/" + BPID_1 + "/finalized",
TEST_VOLUME.getFinalizedDir(BPID_1).getAbsolutePath());
DirectoryScanner.ScanInfo scanInfo = DirectoryScanner.ScanInfo scanInfo =
new DirectoryScanner.ScanInfo(blockId, blockFile, metaFile, TEST_VOLUME); new DirectoryScanner.ScanInfo(blockId, blockFile, metaFile, TEST_VOLUME);
assertEquals(blockId, scanInfo.getBlockId()); assertEquals(blockId, scanInfo.getBlockId());