Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1400345 from trunk for HDFS-4088. Remove "throws QuotaExceededException" from an INodeDirectoryWithQuota constructor. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400346 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-10-20 00:08:14 +00:00
parent e0ced0a835
commit 01557d0464
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -56,7 +56,7 @@ Release 2.0.3-alpha - Unreleased
HDFS-4037. Rename the getReplication() method in BlockCollection to HDFS-4037. Rename the getReplication() method in BlockCollection to
getBlockReplication(). (szetszwo) getBlockReplication(). (szetszwo)
HDFS-4036. Remove "throw UnresolvedLinkException" from HDFS-4036. Remove "throws UnresolvedLinkException" from
FSDirectory.unprotectedAddFile(..). (Jing Zhao via szetszwo) FSDirectory.unprotectedAddFile(..). (Jing Zhao via szetszwo)
HDFS-2946. HA: Put a cap on the number of completed edits files retained HDFS-2946. HA: Put a cap on the number of completed edits files retained
@ -71,6 +71,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-4074. Remove the unused default constructor from INode. (Brandon Li HDFS-4074. Remove the unused default constructor from INode. (Brandon Li
via szetszwo) via szetszwo)
HDFS-4088. Remove "throws QuotaExceededException" from an
INodeDirectoryWithQuota constructor. (szetszwo)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

15
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java
View File

@ -37,21 +37,19 @@ class INodeDirectoryWithQuota extends INodeDirectory {
* @param dsQuota Diskspace quota to be assigned to this indoe * @param dsQuota Diskspace quota to be assigned to this indoe
* @param other The other inode from which all other properties are copied * @param other The other inode from which all other properties are copied
*/ */
INodeDirectoryWithQuota(long nsQuota, long dsQuota, INodeDirectory other) INodeDirectoryWithQuota(long nsQuota, long dsQuota,
throws QuotaExceededException { INodeDirectory other) {
super(other); super(other);
INode.DirCounts counts = new INode.DirCounts(); INode.DirCounts counts = new INode.DirCounts();
other.spaceConsumedInTree(counts); other.spaceConsumedInTree(counts);
this.nsCount= counts.getNsCount(); this.nsCount = counts.getNsCount();
this.diskspace = counts.getDsCount(); this.diskspace = counts.getDsCount();
setQuota(nsQuota, dsQuota); setQuota(nsQuota, dsQuota);
} }
/** constructor with no quota verification */ /** constructor with no quota verification */
INodeDirectoryWithQuota( INodeDirectoryWithQuota(PermissionStatus permissions, long modificationTime,
PermissionStatus permissions, long modificationTime, long nsQuota, long dsQuota) {
long nsQuota, long dsQuota)
{
super(permissions, modificationTime); super(permissions, modificationTime);
this.nsQuota = nsQuota; this.nsQuota = nsQuota;
this.dsQuota = dsQuota; this.dsQuota = dsQuota;
@ -60,8 +58,7 @@ class INodeDirectoryWithQuota extends INodeDirectory {
/** constructor with no quota verification */ /** constructor with no quota verification */
INodeDirectoryWithQuota(String name, PermissionStatus permissions, INodeDirectoryWithQuota(String name, PermissionStatus permissions,
long nsQuota, long dsQuota) long nsQuota, long dsQuota) {
{
super(name, permissions); super(name, permissions);
this.nsQuota = nsQuota; this.nsQuota = nsQuota;
this.dsQuota = dsQuota; this.dsQuota = dsQuota;