You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/07/23 19:50:40 UTC
svn commit: r1612898 - in
/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Author: arp
Date: Wed Jul 23 17:50:39 2014
New Revision: 1612898
URL: http://svn.apache.org/r1612898
Log:
HADOOP-10872: Merging r1612897 from branch-2 to branch-2.5.
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Modified: hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1612898&r1=1612897&r2=1612898&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jul 23 17:50:39 2014
@@ -333,6 +333,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10864. Tool documentenation is broken. (Akira Ajisaka
via Arpit Agarwal)
+ HADOOP-10872. TestPathData fails intermittently with "Mkdirs failed
+ to create d1". (Yongjun Zhang via Arpit Agarwal)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java?rev=1612898&r1=1612897&r2=1612898&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java Wed Jul 23 17:50:39 2014
@@ -437,7 +437,9 @@ public abstract class ChecksumFileSystem
throw new FileNotFoundException("Parent directory doesn't exist: "
+ parent);
} else if (!mkdirs(parent)) {
- throw new IOException("Mkdirs failed to create " + parent);
+ throw new IOException("Mkdirs failed to create " + parent
+ + " (exists=" + exists(parent) + ", cwd=" + getWorkingDirectory()
+ + ")");
}
}
final FSDataOutputStream out;
Modified: hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java?rev=1612898&r1=1612897&r2=1612898&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Wed Jul 23 17:50:39 2014
@@ -35,19 +35,22 @@ import org.junit.Before;
import org.junit.Test;
public class TestPathData {
+ private static final String TEST_ROOT_DIR =
+ System.getProperty("test.build.data","build/test/data") + "/testPD";
protected Configuration conf;
protected FileSystem fs;
protected Path testDir;
-
+
@Before
public void initialize() throws Exception {
conf = new Configuration();
fs = FileSystem.getLocal(conf);
- testDir = new Path(
- System.getProperty("test.build.data", "build/test/data") + "/testPD"
- );
+ testDir = new Path(TEST_ROOT_DIR);
+
// don't want scheme on the path, just an absolute path
testDir = new Path(fs.makeQualified(testDir).toUri().getPath());
+ fs.mkdirs(testDir);
+
FileSystem.setDefaultUri(conf, fs.getUri());
fs.setWorkingDirectory(testDir);
fs.mkdirs(new Path("d1"));
@@ -60,6 +63,7 @@ public class TestPathData {
@After
public void cleanup() throws Exception {
+ fs.delete(testDir, true);
fs.close();
}