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:
parent
e0ced0a835
commit
01557d0464
|
@ -56,7 +56,7 @@ Release 2.0.3-alpha - Unreleased
|
|||
HDFS-4037. Rename the getReplication() method in BlockCollection to
|
||||
getBlockReplication(). (szetszwo)
|
||||
|
||||
HDFS-4036. Remove "throw UnresolvedLinkException" from
|
||||
HDFS-4036. Remove "throws UnresolvedLinkException" from
|
||||
FSDirectory.unprotectedAddFile(..). (Jing Zhao via szetszwo)
|
||||
|
||||
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
|
||||
via szetszwo)
|
||||
|
||||
HDFS-4088. Remove "throws QuotaExceededException" from an
|
||||
INodeDirectoryWithQuota constructor. (szetszwo)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
|
|
@ -37,21 +37,19 @@ class INodeDirectoryWithQuota extends INodeDirectory {
|
|||
* @param dsQuota Diskspace quota to be assigned to this indoe
|
||||
* @param other The other inode from which all other properties are copied
|
||||
*/
|
||||
INodeDirectoryWithQuota(long nsQuota, long dsQuota, INodeDirectory other)
|
||||
throws QuotaExceededException {
|
||||
INodeDirectoryWithQuota(long nsQuota, long dsQuota,
|
||||
INodeDirectory other) {
|
||||
super(other);
|
||||
INode.DirCounts counts = new INode.DirCounts();
|
||||
other.spaceConsumedInTree(counts);
|
||||
this.nsCount= counts.getNsCount();
|
||||
this.nsCount = counts.getNsCount();
|
||||
this.diskspace = counts.getDsCount();
|
||||
setQuota(nsQuota, dsQuota);
|
||||
}
|
||||
|
||||
/** constructor with no quota verification */
|
||||
INodeDirectoryWithQuota(
|
||||
PermissionStatus permissions, long modificationTime,
|
||||
long nsQuota, long dsQuota)
|
||||
{
|
||||
INodeDirectoryWithQuota(PermissionStatus permissions, long modificationTime,
|
||||
long nsQuota, long dsQuota) {
|
||||
super(permissions, modificationTime);
|
||||
this.nsQuota = nsQuota;
|
||||
this.dsQuota = dsQuota;
|
||||
|
@ -59,9 +57,8 @@ class INodeDirectoryWithQuota extends INodeDirectory {
|
|||
}
|
||||
|
||||
/** constructor with no quota verification */
|
||||
INodeDirectoryWithQuota(String name, PermissionStatus permissions,
|
||||
long nsQuota, long dsQuota)
|
||||
{
|
||||
INodeDirectoryWithQuota(String name, PermissionStatus permissions,
|
||||
long nsQuota, long dsQuota) {
|
||||
super(name, permissions);
|
||||
this.nsQuota = nsQuota;
|
||||
this.dsQuota = dsQuota;
|
||||
|
|
Loading…
Reference in New Issue