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 sz...@apache.org on 2012/04/05 21:49:43 UTC
svn commit: r1310040 - in /hadoop/common/branches/branch-1.0: ./ CHANGES.txt
ivy.xml ivy/libraries.properties src/core/org/apache/hadoop/fs/FileUtil.java
src/test/org/apache/hadoop/fs/TestFileUtil.java
Author: szetszwo
Date: Thu Apr 5 19:49:43 2012
New Revision: 1310040
URL: http://svn.apache.org/viewvc?rev=1310040&view=rev
Log:
svn merge -c 1310039 from branch-1 for HADOOP-6963.
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/ivy.xml
hadoop/common/branches/branch-1.0/ivy/libraries.properties
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/fs/FileUtil.java
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileUtil.java
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1310039
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1310040&r1=1310039&r2=1310040&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Apr 5 19:49:43 2012
@@ -28,6 +28,9 @@ Release 1.0.3 - unreleased
HADOOP-5528. Ensure BinaryPartitioner is present in mapred libs. (Klaas
Bosteels via acmurthy)
+ HADOOP-6963. In FileUtil.getDU(..), neither include the size of directories
+ nor follow symbolic links. (Ravi Prakash via szetszwo)
+
Release 1.0.2 - 2012.03.24
NEW FEATURES
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1310039
Modified: hadoop/common/branches/branch-1.0/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy.xml?rev=1310040&r1=1310039&r2=1310040&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy.xml (original)
+++ hadoop/common/branches/branch-1.0/ivy.xml Thu Apr 5 19:49:43 2012
@@ -85,6 +85,11 @@
rev="${commons-cli.version}"
conf="client->default"/>
+ <dependency org="commons-io"
+ name="commons-io"
+ rev="${commons-io.version}"
+ conf="client->default"/>
+
<dependency org="checkstyle"
name="checkstyle"
rev="${checkstyle.version}"
Modified: hadoop/common/branches/branch-1.0/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy/libraries.properties?rev=1310040&r1=1310039&r2=1310040&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-1.0/ivy/libraries.properties Thu Apr 5 19:49:43 2012
@@ -38,7 +38,7 @@ commons-logging-api.version=1.0.4
commons-math.version=2.1
commons-el.version=1.0
commons-fileupload.version=1.2
-commons-io.version=1.4
+commons-io.version=2.1
commons-net.version=1.4.1
core.version=3.1.1
coreplugin.version=1.3.2
Modified: hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/fs/FileUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/fs/FileUtil.java?rev=1310040&r1=1310039&r2=1310040&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/fs/FileUtil.java (original)
+++ hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/fs/FileUtil.java Thu Apr 5 19:49:43 2012
@@ -448,11 +448,18 @@ public class FileUtil {
if (!dir.isDirectory()) {
return dir.length();
} else {
- size = dir.length();
File[] allFiles = dir.listFiles();
if(allFiles != null) {
for (int i = 0; i < allFiles.length; i++) {
- size = size + getDU(allFiles[i]);
+ boolean isSymLink;
+ try {
+ isSymLink = org.apache.commons.io.FileUtils.isSymlink(allFiles[i]);
+ } catch(IOException ioe) {
+ isSymLink = true;
+ }
+ if(!isSymLink) {
+ size += getDU(allFiles[i]);
+ }
}
}
return size;
Modified: hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileUtil.java?rev=1310040&r1=1310039&r2=1310040&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileUtil.java (original)
+++ hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileUtil.java Thu Apr 5 19:49:43 2012
@@ -78,6 +78,9 @@ public class TestFileUtil {
File linkDir = new File(del, "tmpDir");
FileUtil.symLink(tmp.toString(), linkDir.toString());
Assert.assertEquals(5, del.listFiles().length);
+
+ // create a cycle using symlinks. Cycles should be handled
+ FileUtil.symLink(del.toString(), del.toString() + "/" + DIR + "1/cycle");
}
@After
@@ -303,4 +306,17 @@ public class TestFileUtil {
//Expected an IOException
}
}
+
+ /**
+ * Test that getDU is able to handle cycles caused due to symbolic links
+ * and that directory sizes are not added to the final calculated size
+ * @throws IOException
+ */
+ @Test
+ public void testGetDU() throws IOException {
+ setupDirs();
+
+ long du = FileUtil.getDU(TEST_DIR);
+ Assert.assertEquals(du, 0);
+ }
}