You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by at...@apache.org on 2011/06/27 09:05:51 UTC
svn commit: r1140030 - in /hadoop/common/trunk/hdfs: CHANGES.txt
src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java
src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java
Author: atm
Date: Mon Jun 27 07:05:50 2011
New Revision: 1140030
URL: http://svn.apache.org/viewvc?rev=1140030&view=rev
Log:
HDFS-1723. quota errors messages should use the same scale. (Jim Plush via atm)
Modified:
hadoop/common/trunk/hdfs/CHANGES.txt
hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java
hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java
Modified: hadoop/common/trunk/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/CHANGES.txt?rev=1140030&r1=1140029&r2=1140030&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hdfs/CHANGES.txt Mon Jun 27 07:05:50 2011
@@ -529,6 +529,9 @@ Trunk (unreleased changes)
HDFS-2087. Declare methods in DataTransferProtocol interface, and change
Sender and Receiver to implement the interface. (szetszwo)
+ HDFS-1723. quota errors messages should use the same scale. (Jim Plush via
+ atm)
+
OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
Modified: hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java?rev=1140030&r1=1140029&r2=1140030&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java (original)
+++ hadoop/common/trunk/hdfs/src/java/org/apache/hadoop/hdfs/protocol/DSQuotaExceededException.java Mon Jun 27 07:05:50 2011
@@ -41,7 +41,8 @@ public class DSQuotaExceededException ex
String msg = super.getMessage();
if (msg == null) {
return "The DiskSpace quota" + (pathName==null?"":(" of " + pathName)) +
- " is exceeded: quota=" + quota + " diskspace consumed=" + StringUtils.humanReadableInt(count);
+ " is exceeded: quota=" + StringUtils.humanReadableInt(quota) +
+ " diskspace consumed=" + StringUtils.humanReadableInt(count);
} else {
return msg;
}
Modified: hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml?rev=1140030&r1=1140029&r2=1140030&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml (original)
+++ hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml Mon Jun 27 07:05:50 2011
@@ -15440,7 +15440,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>put: The DiskSpace quota of /dir1 is exceeded: quota=1024 diskspace consumed=[0-9.]+[kmg]*</expected-output>
+ <expected-output>put: The DiskSpace quota of /dir1 is exceeded: quota=1.0k diskspace consumed=[0-9.]+[kmg]*</expected-output>
</comparator>
</comparators>
</test>
Modified: hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java?rev=1140030&r1=1140029&r2=1140030&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java (original)
+++ hadoop/common/trunk/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java Mon Jun 27 07:05:50 2011
@@ -54,6 +54,23 @@ public class TestQuota {
}
}
+ /**
+ * Tests to make sure we're getting human readable Quota exception messages
+ * Test for @link{ NSQuotaExceededException, DSQuotaExceededException}
+ * @throws Exception
+ */
+ @Test
+ public void testDSQuotaExceededExceptionIsHumanReadable() throws Exception {
+ Integer bytes = 1024;
+ try {
+ throw new DSQuotaExceededException(bytes, bytes);
+ } catch(DSQuotaExceededException e) {
+
+ assertEquals("The DiskSpace quota is exceeded: quota=1.0k " +
+ "diskspace consumed=1.0k", e.getMessage());
+ }
+ }
+
/** Test quota related commands:
* setQuota, clrQuota, setSpaceQuota, clrSpaceQuota, and count
*/