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 ha...@apache.org on 2008/06/30 23:14:39 UTC

svn commit: r672925 - in /hadoop/core/trunk: CHANGES.txt src/hdfs/org/apache/hadoop/dfs/FSDirectory.java

Author: hairong
Date: Mon Jun 30 14:14:39 2008
New Revision: 672925

URL: http://svn.apache.org/viewvc?rev=672925&view=rev
Log:
HADOOP-3572. SetQuotas usage interface has some minor bugs. Contributed by Hairong Kuang.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=672925&r1=672924&r2=672925&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Jun 30 14:14:39 2008
@@ -718,6 +718,8 @@
     HADOOP-3539. Exception when closing DFSClient while multiple files are
     open. (Benjamin Gufler via hairong)
 
+    HADOOP-3572. SetQuotas usage interface has some minor bugs. (hairong)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java?rev=672925&r1=672924&r2=672925&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/dfs/FSDirectory.java Mon Jun 30 14:14:39 2008
@@ -981,8 +981,10 @@
     synchronized (rootDir) {
       rootDir.getExistingPathINodes(components, inodes);
       INode targetNode = inodes[inodes.length-1];
-      if (targetNode == null || !targetNode.isDirectory()) {
+      if (targetNode == null) {
         throw new FileNotFoundException("Directory does not exist: " + srcs);
+      } else if (!targetNode.isDirectory()) {
+        throw new FileNotFoundException("Cannot set quota on a file: " + srcs);  
       } else { // a directory inode
         INodeDirectory dirNode = (INodeDirectory)targetNode;
         if (dirNode instanceof INodeDirectoryWithQuota) {