Repository: hadoop Updated Branches: refs/heads/branch-2 03f50de48 -> cd256c1fd refs/heads/trunk 0f0e897bf -> 4014ce599
HDFS-8581. ContentSummary on / skips further counts on yielding lock (contributed by J.Andreina) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4014ce59 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4014ce59 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4014ce59 Branch: refs/heads/trunk Commit: 4014ce5990bff9b0ecb3d38a633d40eaf6cf07a7 Parents: 0f0e897 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Thu Sep 10 00:08:19 2015 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Thu Sep 10 00:08:19 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++ .../hdfs/server/namenode/INodeDirectory.java | 2 +- .../java/org/apache/hadoop/hdfs/TestQuota.java | 32 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4014ce59/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8edc389..bbb6066 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1326,6 +1326,9 @@ Release 2.8.0 - UNRELEASED HDFS-8939. Test(S)WebHdfsFileContextMainOperations failing on branch-2. (Chris Nauroth via jghoman) + HDFS-8581. ContentSummary on / skips further counts on yielding lock + (J.Andreina via vinayakumarb) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4014ce59/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java index 5c33c02..21fe313 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java @@ -660,7 +660,7 @@ public class INodeDirectory extends INodeWithAdditionalFields continue; } // The locks were released and reacquired. Check parent first. - if (getParent() == null) { + if (!isRoot() && getParent() == null) { // Stop further counting and return whatever we have so far. break; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4014ce59/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java index e339049..00ff07f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java @@ -24,12 +24,14 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; import java.security.PrivilegedExceptionAction; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.ContentSummary; +import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.StorageType; @@ -1007,4 +1009,34 @@ public class TestQuota { assertTrue(errOutput.contains(StorageType.getTypesSupportingQuota() .toString())); } + + /** + * File count on root , should return total value of files in Filesystem + * when one folder contains files more than "dfs.content-summary.limit". + */ + @Test + public void testHugeFileCount() throws IOException { + MiniDFSCluster cluster = null; + Configuration conf = new Configuration(); + conf.setInt("dfs.content-summary.limit", 4); + try { + cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0).build(); + DistributedFileSystem dfs = cluster.getFileSystem(); + for (int i = 1; i <= 5; i++) { + FSDataOutputStream out = + dfs.create(new Path("/Folder1/" + "file" + i),(short)1); + out.close(); + } + FSDataOutputStream out = dfs.create(new Path("/Folder2/file6"),(short)1); + out.close(); + ContentSummary contentSummary = dfs.getContentSummary(new Path("/")); + assertEquals(6, contentSummary.getFileCount()); + } finally { + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } + } + } + }