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

HDFS-8554. TestDatanodeLayoutUpgrade fails on Windows. Contributed by Chris Nauroth. 

(cherry picked from commit 0e80d51983)
This commit is contained in:
cnauroth 2015-06-08 08:39:02 -07:00
parent c3c2b4d318
commit 8ee50d8ca7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -727,6 +727,12 @@ public class FileUtil {
} }
} }
if (entry.isLink()) {
File src = new File(outputDir, entry.getLinkName());
HardLink.createHardLink(src, outputFile);
return;
}
int count; int count;
byte data[] = new byte[2048]; byte data[] = new byte[2048];
BufferedOutputStream outputStream = new BufferedOutputStream( BufferedOutputStream outputStream = new BufferedOutputStream(

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

@ -527,6 +527,8 @@ Release 2.8.0 - UNRELEASED
HDFS-8539. Hdfs doesnt have class 'debug' in windows. HDFS-8539. Hdfs doesnt have class 'debug' in windows.
(Anu Engineer via cnauroth) (Anu Engineer via cnauroth)
HDFS-8554. TestDatanodeLayoutUpgrade fails on Windows. (cnauroth)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeLayoutUpgrade.java
View File

@ -37,11 +37,11 @@ public class TestDatanodeLayoutUpgrade {
upgrade.unpackStorage(HADOOP24_DATANODE, HADOOP_DATANODE_DIR_TXT); upgrade.unpackStorage(HADOOP24_DATANODE, HADOOP_DATANODE_DIR_TXT);
Configuration conf = new Configuration(TestDFSUpgradeFromImage.upgradeConf); Configuration conf = new Configuration(TestDFSUpgradeFromImage.upgradeConf);
conf.set(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY, conf.set(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY,
System.getProperty("test.build.data") + File.separator + new File(System.getProperty("test.build.data"),
"dfs" + File.separator + "data"); "dfs" + File.separator + "data").toURI().toString());
conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY,
System.getProperty("test.build.data") + File.separator + new File(System.getProperty("test.build.data"),
"dfs" + File.separator + "name"); "dfs" + File.separator + "name").toURI().toString());
upgrade.upgradeAndVerify(new MiniDFSCluster.Builder(conf).numDataNodes(1) upgrade.upgradeAndVerify(new MiniDFSCluster.Builder(conf).numDataNodes(1)
.manageDataDfsDirs(false).manageNameDfsDirs(false), null); .manageDataDfsDirs(false).manageNameDfsDirs(false), null);
} }