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

HDFS-3833. Merging 1379525 from trunk. Contributed by Brandon Li 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379594 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-08-31 20:37:29 +00:00
parent b2382b0cd4
commit 5f9c37562d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,6 +529,12 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3733. Audit logs should include WebHDFS access. (Andy Isaacson via eli) HDFS-3733. Audit logs should include WebHDFS access. (Andy Isaacson via eli)
HDFS-2686. Remove DistributedUpgrade related code. (suresh)
HDFS-3833. TestDFSShell fails on windows due to concurrent file
read/write. (Brandon Li via suresh)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd) HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
@ -545,8 +551,6 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3432. TestDFSZKFailoverController tries to fail over too early (todd) HDFS-3432. TestDFSZKFailoverController tries to fail over too early (todd)
HDFS-2686. Remove DistributedUpgrade related code. (suresh)
Release 2.0.0-alpha - 05-23-2012 Release 2.0.0-alpha - 05-23-2012
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
View File

@ -1284,6 +1284,11 @@ public class TestDFSShell {
public void testGet() throws IOException { public void testGet() throws IOException {
DFSTestUtil.setLogLevel2All(FSInputChecker.LOG); DFSTestUtil.setLogLevel2All(FSInputChecker.LOG);
final Configuration conf = new HdfsConfiguration(); final Configuration conf = new HdfsConfiguration();
// Race can happen here: block scanner is reading the file when test tries
// to corrupt the test file, which will fail the test on Windows platform.
// Disable block scanner to avoid this race.
conf.setInt(DFSConfigKeys.DFS_DATANODE_SCAN_PERIOD_HOURS_KEY, -1);
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build(); MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build();
DistributedFileSystem dfs = (DistributedFileSystem)cluster.getFileSystem(); DistributedFileSystem dfs = (DistributedFileSystem)cluster.getFileSystem();